diff --git a/tests/closure/tissues.nim b/tests/closure/tclosure_issues.nim
similarity index 97%
rename from tests/closure/tissues.nim
rename to tests/closure/tclosure_issues.nim
index d33e3b4035..b2d77c5716 100644
--- a/tests/closure/tissues.nim
+++ b/tests/closure/tclosure_issues.nim
@@ -1,5 +1,4 @@
 discard """
-  file: "tissues.nim"
   output: '''true'''
 """
 
diff --git a/tests/concepts/tissues.nim b/tests/concepts/tconcepts_issues.nim
similarity index 100%
rename from tests/concepts/tissues.nim
rename to tests/concepts/tconcepts_issues.nim
diff --git a/tests/distinct/tissues.nim b/tests/distinct/tdistinct_issues.nim
similarity index 100%
rename from tests/distinct/tissues.nim
rename to tests/distinct/tdistinct_issues.nim
diff --git a/tests/generics/t5707.nim b/tests/generics/t5707.nim
deleted file mode 100644
index a155e15970..0000000000
--- a/tests/generics/t5707.nim
+++ /dev/null
@@ -1,6 +0,0 @@
-import sugar
-
-proc foo[T]: seq[int] =
-    return lc[x | (x <- 1..10, x mod 2 == 0), int]
-
-doAssert foo[float32]() == @[2, 4, 6, 8, 10]
diff --git a/tests/generics/tissues.nim b/tests/generics/tgenerics_issues.nim
similarity index 99%
rename from tests/generics/tissues.nim
rename to tests/generics/tgenerics_issues.nim
index e958549d6b..c215ea2c2e 100644
--- a/tests/generics/tissues.nim
+++ b/tests/generics/tgenerics_issues.nim
@@ -763,3 +763,11 @@ block t3717:
 
   var f: Foo[Foo[int]]
   discard foo(f)
+
+
+
+block t5707:
+  proc foo[T]: seq[int] =
+      return lc[x | (x <- 1..10, x mod 2 == 0), int]
+
+  doAssert foo[float32]() == @[2, 4, 6, 8, 10]
diff --git a/tests/generics/tvarious.nim b/tests/generics/tgenerics_various.nim
similarity index 100%
rename from tests/generics/tvarious.nim
rename to tests/generics/tgenerics_various.nim
diff --git a/tests/iter/tissues.nim b/tests/iter/titer_issues.nim
similarity index 100%
rename from tests/iter/tissues.nim
rename to tests/iter/titer_issues.nim
diff --git a/tests/macros/tissues.nim b/tests/macros/tmacros_issues.nim
similarity index 100%
rename from tests/macros/tissues.nim
rename to tests/macros/tmacros_issues.nim
diff --git a/tests/macros/tvarious.nim b/tests/macros/tmacros_various.nim
similarity index 100%
rename from tests/macros/tvarious.nim
rename to tests/macros/tmacros_various.nim
diff --git a/tests/metatype/tissues.nim b/tests/metatype/tmetatype_issues.nim
similarity index 100%
rename from tests/metatype/tissues.nim
rename to tests/metatype/tmetatype_issues.nim
diff --git a/tests/metatype/tvarious.nim b/tests/metatype/tmetatype_various.nim
similarity index 100%
rename from tests/metatype/tvarious.nim
rename to tests/metatype/tmetatype_various.nim
diff --git a/tests/method/tissues.nim b/tests/method/tmethod_issues.nim
similarity index 100%
rename from tests/method/tissues.nim
rename to tests/method/tmethod_issues.nim
diff --git a/tests/method/tvarious.nim b/tests/method/tmethod_various.nim
similarity index 100%
rename from tests/method/tvarious.nim
rename to tests/method/tmethod_various.nim
diff --git a/tests/objects/tissues.nim b/tests/objects/tobjects_issues.nim
similarity index 100%
rename from tests/objects/tissues.nim
rename to tests/objects/tobjects_issues.nim
diff --git a/tests/objects/tvarious.nim b/tests/objects/tobjects_various.nim
similarity index 100%
rename from tests/objects/tvarious.nim
rename to tests/objects/tobjects_various.nim
diff --git a/tests/overload/tissues.nim b/tests/overload/toverload_issues.nim
similarity index 100%
rename from tests/overload/tissues.nim
rename to tests/overload/toverload_issues.nim
diff --git a/tests/overload/tvarious.nim b/tests/overload/toverload_various.nim
similarity index 100%
rename from tests/overload/tvarious.nim
rename to tests/overload/toverload_various.nim
diff --git a/tests/sets/tvarious.nim b/tests/sets/tsets_various.nim
similarity index 100%
rename from tests/sets/tvarious.nim
rename to tests/sets/tsets_various.nim
diff --git a/tests/stdlib/tissues.nim b/tests/stdlib/tstdlib_issues.nim
similarity index 100%
rename from tests/stdlib/tissues.nim
rename to tests/stdlib/tstdlib_issues.nim
diff --git a/tests/stdlib/tvarious.nim b/tests/stdlib/tstdlib_various.nim
similarity index 100%
rename from tests/stdlib/tvarious.nim
rename to tests/stdlib/tstdlib_various.nim