diff --git a/test_runner/src/main/kotlin/ftl/shard/Shard.kt b/test_runner/src/main/kotlin/ftl/shard/Shard.kt
index 8af68ac574..36d9058254 100644
--- a/test_runner/src/main/kotlin/ftl/shard/Shard.kt
+++ b/test_runner/src/main/kotlin/ftl/shard/Shard.kt
@@ -136,7 +136,8 @@ object Shard {
         testcases.sortByDescending { it.time }
 
         testcases.forEach { testMethod ->
-            val shard = shards.first()
+            // num_shards must be > 1, and <= 50
+            val shard = shards.first { it.testMethods.size + args.testTargetsAlwaysRun.size < 50 }
 
             shard.testMethods.add(testMethod)
             shard.time += testMethod.time