5 files changed, 6 insertions, 9 deletions
diff --git a/tests/threads/t8535.nim b/tests/threads/t8535.nim
index a8d69657b..e1b5a1369 100644
--- a/tests/threads/t8535.nim
+++ b/tests/threads/t8535.nim
@@ -12,5 +12,5 @@ type
 
 var foo {.threadvar.}: CircAlloc[1,Job]
 
-when isMainModule:
+when true:
   echo foo.index
diff --git a/tests/threads/tactors2.nim b/tests/threads/tactors2.nim
index b011ef140..e8afe203c 100644
--- a/tests/threads/tactors2.nim
+++ b/tests/threads/tactors2.nim
@@ -12,7 +12,7 @@ proc thread_proc(input: some_type): some_type {.thread.} =
   result.bla = 1
 
 proc main() =
-  var actorPool: TActorPool[some_type, some_type]
+  var actorPool: ActorPool[some_type, some_type]
   createActorPool(actorPool, 1)
 
   var some_data: some_type
diff --git a/tests/threads/threadex.nim b/tests/threads/threadex.nim
index 679bfcb12..e61ce5c9c 100644
--- a/tests/threads/threadex.nim
+++ b/tests/threads/threadex.nim
@@ -1,5 +1,5 @@
 discard """
-  outputsub: "All rights reserved."
+  outputsub: "Just a simple text for test"
 """
 
 type
@@ -28,7 +28,7 @@ proc consume() {.thread.} =
 proc produce() {.thread.} =
   prodId = getThreadId()
   var m: TMsg
-  var input = open("readme.txt")
+  var input = open("tests/dummy.txt")
   var line = ""
   while input.readLine(line):
     m.data = line
diff --git a/tests/threads/tthreadanalysis2.nim b/tests/threads/tthreadanalysis2.nim
index c1ec3ae39..067e186a8 100644
--- a/tests/threads/tthreadanalysis2.nim
+++ b/tests/threads/tthreadanalysis2.nim
@@ -1,7 +1,7 @@
 discard """
+  errormsg: "'threadFunc' is not GC-safe"
   file: "tthreadanalysis2.nim"
   line: 37
-  errormsg: "'threadFunc' is not GC-safe"
   cmd: "nim $target --hints:on --threads:on $options $file"
 """
 
@@ -49,4 +49,3 @@ proc main =
   joinThreads(thr)
 
 main()
-
diff --git a/tests/threads/tthreadheapviolation1.nim b/tests/threads/tthreadheapviolation1.nim
index 59ecb742c..379bd55e6 100644
--- a/tests/threads/tthreadheapviolation1.nim
+++ b/tests/threads/tthreadheapviolation1.nim
@@ -1,6 +1,6 @@
 discard """
-  line: 11
   errormsg: "'horrible' is not GC-safe"
+  line: 11
   cmd: "nim $target --hints:on --threads:on $options $file"
 """
 
@@ -16,5 +16,3 @@ proc horrible() {.thread.} =
 
 createThread[void](t, horrible)
 joinThread(t)
-
-