diff --git a/build.gradle b/build.gradle
index 3985a369..d7fe208e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,9 +48,9 @@ repositories {
     }
 }
 
-sourceSets {
-    test
-}
+//sourceSets {
+//    test
+//}
 
 group = project.mod_group_id
 
@@ -80,6 +80,15 @@ neoForge {
 
     validateAccessTransformers = true
 
+    mods {
+        "${mod_id}" {
+            sourceSet sourceSets.main
+        }
+        "modularrouterstest" {
+            sourceSet sourceSets.test
+        }
+    }
+
     runs {
         // applies to all the run configs below
         configureEach {
@@ -104,6 +113,7 @@ neoForge {
             // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
             systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
             loadedMods = [mods.modularrouters, mods.modularrouterstest]
+            sourceSet = sourceSets.test
         }
 
         server {
@@ -118,6 +128,8 @@ neoForge {
         gameTestServer {
             type = "gameTestServer"
             systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+            loadedMods = [mods.modularrouters, mods.modularrouterstest]
+            sourceSet = sourceSets.test
         }
 
         data {
@@ -126,13 +138,6 @@ neoForge {
             programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
         }
     }
-
-    mods {
-        "${mod_id}" {
-            sourceSet sourceSets.main
-            sourceSet sourceSets.test
-        }
-    }
 }
 
 // Include resources generated by data generators.
@@ -146,8 +151,6 @@ dependencies {
 //    implementation "net.neoforged:neoforge:${neo_version}"
     localRuntime(testImplementation("net.neoforged:testframework:${neo_version}"))
 
-//    implementation sourceSets.test.output
-
     compileOnly("mcjty.theoneprobe:theoneprobe:${top_version}") {
         transitive = false
     }