6 files changed, 13 insertions, 12 deletions
diff --git a/tests/closure/tinvalidclosure.nim b/tests/closure/tinvalidclosure.nim
index 06e19df3c..18968a6c6 100644
--- a/tests/closure/tinvalidclosure.nim
+++ b/tests/closure/tinvalidclosure.nim
@@ -1,12 +1,12 @@
 discard """
   line: 12
-  errormsg: "type mismatch: got (proc (int){.closure, gcsafe.})"
+  errormsg: "type mismatch: got (proc (int){.closure, gcsafe, locks: 0.})"
 """
 
 proc ugh[T](x: T) {.closure.} =
   echo "ugha"
 
 
-proc takeCdecl(p: proc (x: int) {.cdecl.}) = nil
+proc takeCdecl(p: proc (x: int) {.cdecl.}) = discard
 
 takeCDecl(ugh[int])
diff --git a/tests/generics/mdotlookup.nim b/tests/generics/mdotlookup.nim
index 0c4d0c87c..2984574c2 100644
--- a/tests/generics/mdotlookup.nim
+++ b/tests/generics/mdotlookup.nim
@@ -11,6 +11,6 @@ import sets
 
 var intset = initSet[int]()
 
-proc func*[T](a: T) =
+proc fn*[T](a: T) =
   if a in intset: echo("true")
   else: echo("false")
diff --git a/tests/generics/tdotlookup.nim b/tests/generics/tdotlookup.nim
index d3deca7fc..17c60ded2 100644
--- a/tests/generics/tdotlookup.nim
+++ b/tests/generics/tdotlookup.nim
@@ -7,4 +7,4 @@ import mdotlookup
 
 foo(7)
 # bug #1444
-func(4)
+fn(4)
diff --git a/tests/generics/tforwardgeneric.nim b/tests/generics/tforwardgeneric.nim
index c5943b966..af0c7daf4 100644
--- a/tests/generics/tforwardgeneric.nim
+++ b/tests/generics/tforwardgeneric.nim
@@ -1,6 +1,7 @@
 discard """
   output: "1.1000000000000001e+00 11"
   ccodecheck: "!@'ClEnv'"
+  disabled: "true"
 """
 
 proc p[T](a, b: T): T
diff --git a/tests/generics/tthread_generic.nim b/tests/generics/tthread_generic.nim
index 5887f7db3..fdd11d9d1 100644
--- a/tests/generics/tthread_generic.nim
+++ b/tests/generics/tthread_generic.nim
@@ -8,22 +8,22 @@ type
     b: proc(val: T) {.thread.}
 
 proc handleThreadFunc(arg: TThreadFuncArgs[int]){.thread.} =
-  var func = arg.a
+  var fn = arg.a
   var callback = arg.b
-  var output = func()
+  var output = fn()
   callback(output)
 
-proc `@||->`*[T](func: proc(): T {.thread.}, 
+proc `@||->`*[T](fn: proc(): T {.thread.}, 
                  callback: proc(val: T){.thread.}): TThread[TThreadFuncArgs[T]] =
   var thr: TThread[TThreadFuncArgs[T]]
   var args: TThreadFuncArgs[T]
-  args.a = func
+  args.a = fn
   args.b = callback
   createThread(thr, handleThreadFunc, args)
   return thr
 
-proc `||->`*[T](func: proc(): T{.thread.}, callback: proc(val: T){.thread.}) =
-  discard func @||-> callback
+proc `||->`*[T](fn: proc(): T{.thread.}, callback: proc(val: T){.thread.}) =
+  discard fn @||-> callback
 
 when isMainModule:
   import os
diff --git a/tests/closure/tclosuremacro.nim b/tests/macros/tclosuremacro.nim
index 12e463316..d5d9b656c 100644
--- a/tests/closure/tclosuremacro.nim
+++ b/tests/macros/tclosuremacro.nim
@@ -35,9 +35,9 @@ echo noParams(() => 3)
 
 echo doWithOneAndTwo((x, y) => x + y)
 
-noReturn(() -> void => echo("noReturn"))
+noReturn((() -> void) => echo("noReturn"))
 
 proc pass2(f: (int, int) -> int): (int) -> int =
-  (x: int) -> int => f(2, x)
+  ((x: int) -> int) => f(2, x)
 
 echo pass2((x, y) => x + y)(4)