diff --git a/asyncdispatch2.nimble b/asyncdispatch2.nimble
index 1d42df5d..11e12ece 100644
--- a/asyncdispatch2.nimble
+++ b/asyncdispatch2.nimble
@@ -10,53 +10,25 @@ skipDirs      = @["tests", "Nim", "nim", "benchmarks"]
 requires "nim > 0.18.0"
 
 task test, "Run all tests":
-  exec "nim c -r -d:useSysAssert -d:useGcAssert tests/testsync"
-  exec "nim c -r tests/testsync"
-  exec "nim c -r --gc:markAndSweep tests/testsync"
-  exec "nim c -r -d:release tests/testsync"
+  for tfile in @[
+      "testsync",
+      "testsoon",
+      "testtime",
+      "testfut",
+      "testsignal",
+      "testaddress",
+      "testdatagram",
+      "teststream",
+      "testserver",
+      "testbugs",
+    ]:
+    for cmd in @[
+        "nim c -r -d:useSysAssert -d:useGcAssert tests/" & tfile,
+        "nim c -r tests/" & tfile,
+        "nim c -r --gc:markAndSweep tests/" & tfile,
+        "nim c -r -d:release tests/" & tfile,
+      ]:
+      echo "\n" & cmd
+      exec cmd
+      rmFile("tests/" & tfile)
 
-
-  exec "nim c -r -d:useSysAssert -d:useGcAssert tests/testsoon"
-  exec "nim c -r tests/testsoon"
-  exec "nim c -r --gc:markAndSweep tests/testsoon"
-  exec "nim c -r -d:release tests/testsoon"
-
-  exec "nim c -r -d:useSysAssert -d:useGcAssert tests/testtime"
-  exec "nim c -r tests/testtime"
-  exec "nim c -r --gc:markAndSweep tests/testtime"
-  exec "nim c -r -d:release tests/testtime"
-
-  exec "nim c -r -d:useSysAssert -d:useGcAssert tests/testfut"
-  exec "nim c -r tests/testfut"
-  exec "nim c -r --gc:markAndSweep tests/testfut"
-  exec "nim c -r -d:release tests/testfut"
-
-  exec "nim c -r -d:useSysAssert -d:useGcAssert tests/testsignal"
-  exec "nim c -r tests/testsignal"
-  exec "nim c -r --gc:markAndSweep tests/testsignal"
-  exec "nim c -r -d:release tests/testsignal"
-
-  exec "nim c -r -d:useSysAssert -d:useGcAssert tests/testaddress"
-  exec "nim c -r tests/testaddress"
-  exec "nim c -r --gc:markAndSweep tests/testaddress"
-  exec "nim c -r -d:release tests/testaddress"
-
-  exec "nim c -r -d:useSysAssert -d:useGcAssert tests/testdatagram"
-  exec "nim c -r tests/testdatagram"
-  exec "nim c -r --gc:markAndSweep tests/testdatagram"
-  exec "nim c -r -d:release tests/testdatagram"
-
-  exec "nim c -r -d:useSysAssert -d:useGcAssert tests/teststream"
-  exec "nim c -r tests/teststream"
-  exec "nim c -r --gc:markAndSweep tests/teststream"
-  exec "nim c -r -d:release tests/teststream"
-
-  exec "nim c -r -d:useSysAssert -d:useGcAssert tests/testserver"
-  exec "nim c -r tests/testserver"
-  exec "nim c -r --gc:markAndSweep tests/testserver"
-  exec "nim c -r -d:release tests/testserver"
-
-  exec "nim c -r -d:useSysAssert -d:useGcAssert tests/testbugs"
-  exec "nim c -r tests/testbugs"
-  exec "nim c -r --gc:markAndSweep tests/testbugs"
-  exec "nim c -r -d:release tests/testbugs"
diff --git a/tests/config.nims b/tests/config.nims
index f812bdab..580be36a 100644
--- a/tests/config.nims
+++ b/tests/config.nims
@@ -1,2 +1,4 @@
 switch("hints", "off")
-switch("verbosity", "0")
\ No newline at end of file
+switch("verbosity", "0")
+switch("threads", "on")
+