diff --git a/tests/nixos/fetch-git/testsupport/gitea-repo.nix b/tests/nixos/fetch-git/testsupport/gitea-repo.nix
new file mode 100644
index 000000000..916552bb2
--- /dev/null
+++ b/tests/nixos/fetch-git/testsupport/gitea-repo.nix
@@ -0,0 +1,51 @@
+{ lib, ... }:
+let
+  inherit (lib) mkOption types;
+
+  testCaseExtension = { config, ... }: {
+    setupScript = ''
+      repo = Repo("${config.name}")
+    '';
+  };
+in
+{
+  options = {
+    testCases = mkOption {
+      type = types.listOf (types.submodule testCaseExtension);
+    };
+  };
+  config = {
+    setupScript = ''
+      class Repo:
+        """
+        A class to create a git repository on the gitea server and locally.
+        """
+        def __init__(self, name):
+          self.name = name
+          self.path = "/tmp/repos/" + name
+          self.remote = "http://gitea:3000/test/" + name
+          self.remote_ssh = "ssh://gitea/root/" + name
+          self.git = f"git -C {self.path}"
+          self.create()
+
+        def create(self):
+          # create ssh remote repo
+          gitea.succeed(f"""
+            git init --bare -b main /root/{self.name}
+          """)
+          # create http remote repo
+          gitea.succeed(f"""
+            curl --fail -X POST http://{gitea_admin}:{gitea_admin_password}@gitea:3000/api/v1/user/repos \
+              -H 'Accept: application/json' -H 'Content-Type: application/json' \
+              -d {shlex.quote( f'{{"name":"{self.name}", "default_branch": "main"}}' )}
+          """)
+          # setup git remotes on client
+          client.succeed(f"""
+            mkdir -p {self.path} \
+            && git init -b main {self.path} \
+            && {self.git} remote add origin {self.remote} \
+            && {self.git} remote add origin-ssh root@gitea:{self.name}
+          """)
+    '';
+  };
+}
\ No newline at end of file
diff --git a/tests/nixos/fetch-git/testsupport/gitea.nix b/tests/nixos/fetch-git/testsupport/gitea.nix
index 2ea23961e..cf87bb466 100644
--- a/tests/nixos/fetch-git/testsupport/gitea.nix
+++ b/tests/nixos/fetch-git/testsupport/gitea.nix
@@ -15,6 +15,7 @@
 in {
   imports = [
     ../testsupport/setup.nix
+    ../testsupport/gitea-repo.nix
   ];
   nodes = {
     gitea = { pkgs, ... }: {
@@ -96,5 +97,6 @@ in {
     client.succeed("""
       ssh root@gitea true
     """)
+
   '';
 }
diff --git a/tests/nixos/fetch-git/testsupport/setup.nix b/tests/nixos/fetch-git/testsupport/setup.nix
index 8fc8e2e7c..a81d5614b 100644
--- a/tests/nixos/fetch-git/testsupport/setup.nix
+++ b/tests/nixos/fetch-git/testsupport/setup.nix
@@ -12,7 +12,10 @@ let
     ### TEST ${testCase.name}: ${testCase.description} ###
 
     with subtest("${testCase.description}"):
-        repo = Repo("${testCase.name}")
+        # Setup
+        ${indent testCase.setupScript}
+
+        # Test
         ${indent testCase.script}
   '';
 in
@@ -47,12 +50,19 @@ in
             A description of the test case.
           '';
         };
+        options.setupScript = mkOption {
+          type = types.lines;
+          description = ''
+            Python code that runs before the test case.
+          '';
+          default = "";
+        };
         options.script = mkOption {
           type = types.lines;
           description = ''
             Python code that runs the test.
 
-            Variables defined by `setupScript` will be available here.
+            Variables defined by the global `setupScript`, as well as `testCases.*.setupScript` will be available here.
           '';
         };
       });
@@ -67,36 +77,6 @@ in
       nix.settings.experimental-features = ["nix-command" "flakes"];
     };
     setupScript = ''
-      class Repo:
-        """
-        A class to create a git repository on the gitea server and locally.
-        """
-        def __init__(self, name):
-          self.name = name
-          self.path = "/tmp/repos/" + name
-          self.remote = "http://gitea:3000/test/" + name
-          self.remote_ssh = "ssh://gitea/root/" + name
-          self.git = f"git -C {self.path}"
-          self.create()
-
-        def create(self):
-          # create ssh remote repo
-          gitea.succeed(f"""
-            git init --bare -b main /root/{self.name}
-          """)
-          # create http remote repo
-          gitea.succeed(f"""
-            curl --fail -X POST http://{gitea_admin}:{gitea_admin_password}@gitea:3000/api/v1/user/repos \
-              -H 'Accept: application/json' -H 'Content-Type: application/json' \
-              -d {shlex.quote( f'{{"name":"{self.name}", "default_branch": "main"}}' )}
-          """)
-          # setup git remotes on client
-          client.succeed(f"""
-            mkdir -p {self.path} \
-            && git init -b main {self.path} \
-            && {self.git} remote add origin {self.remote} \
-            && {self.git} remote add origin-ssh root@gitea:{self.name}
-          """)
     '';
     testScript = ''
       start_all();