12 files changed, 10 insertions, 18 deletions
diff --git a/tests/ccgbugs/tmissingderef2.nim b/tests/ccgbugs/tmissingderef2.nim
index 59cd24dd1..23be61bcb 100644
--- a/tests/ccgbugs/tmissingderef2.nim
+++ b/tests/ccgbugs/tmissingderef2.nim
@@ -4,7 +4,7 @@ discard """
 
 # bug #5079
 
-import tables, strutils
+import tables
 
 type Test = ref object
   s: string
diff --git a/tests/ccgbugs/tuple_canon.nim b/tests/ccgbugs/tuple_canon.nim
index 671986054..aa9605d4b 100644
--- a/tests/ccgbugs/tuple_canon.nim
+++ b/tests/ccgbugs/tuple_canon.nim
@@ -12,8 +12,7 @@ foo = bar                     # No error if assigned directly
 
 # bug #2250
 
-import
-    math, strutils
+import math
 
 type
     Meters = float
diff --git a/tests/float/tfloat4.nim b/tests/float/tfloat4.nim
index 56280111c..6a87cbe66 100644
--- a/tests/float/tfloat4.nim
+++ b/tests/float/tfloat4.nim
@@ -2,7 +2,7 @@ discard """
   output: "passed all tests."
 """
 
-import math, strutils
+import strutils
 
 proc c_sprintf(buf, fmt: cstring) {.importc:"sprintf", header: "<stdio.h>", varargs.}
 
diff --git a/tests/iter/titer_issues.nim b/tests/iter/titer_issues.nim
index 773e7dbff..a7830dfab 100644
--- a/tests/iter/titer_issues.nim
+++ b/tests/iter/titer_issues.nim
@@ -22,7 +22,7 @@ end
 """
 
 
-import algorithm, math, sequtils, strutils
+import sequtils, strutils
 
 
 block t338:
diff --git a/tests/macros/tgettype.nim b/tests/macros/tgettype.nim
index 77a55471f..bd70a1c30 100644
--- a/tests/macros/tgettype.nim
+++ b/tests/macros/tgettype.nim
@@ -4,7 +4,7 @@ output: '''
 (BracketExpr (Sym "typeDesc") (Sym "User"))
 '''
 """
-import strutils, macros
+import macros
 
 type
   Model = object of RootObj
diff --git a/tests/macros/tgettypeinst.nim b/tests/macros/tgettypeinst.nim
index 00e9865fa..2f9557160 100644
--- a/tests/macros/tgettypeinst.nim
+++ b/tests/macros/tgettypeinst.nim
@@ -1,7 +1,7 @@
 discard """
 """
 
-import macros, strUtils
+import macros
 
 proc symToIdent(x: NimNode): NimNode =
   case x.kind:
diff --git a/tests/macros/tmacro1.nim b/tests/macros/tmacro1.nim
index 844738c82..7e9120b65 100644
--- a/tests/macros/tmacro1.nim
+++ b/tests/macros/tmacro1.nim
@@ -1,7 +1,5 @@
 import  macros
 
-from uri import `/`
-
 macro test*(a: untyped): untyped =
   var nodes: tuple[a, b: int]
   nodes.a = 4
@@ -22,7 +20,6 @@ macro test*(a: untyped): untyped =
 test:
   "hi"
 
-import strutils
 
 template assertNot(arg: untyped): untyped =
   assert(not(arg))
diff --git a/tests/macros/tmacro4.nim b/tests/macros/tmacro4.nim
index 7c2839aba..cb0399894 100644
--- a/tests/macros/tmacro4.nim
+++ b/tests/macros/tmacro4.nim
@@ -2,8 +2,7 @@ discard """
   output: "after"
 """
 
-import
-  macros, strutils
+import macros
 
 macro test_macro*(s: string, n: untyped): untyped =
   result = newNimNode(nnkStmtList)
diff --git a/tests/macros/tmacros1.nim b/tests/macros/tmacros1.nim
index 706281d13..53af4287c 100644
--- a/tests/macros/tmacros1.nim
+++ b/tests/macros/tmacros1.nim
@@ -5,8 +5,7 @@ discard """
 {a, b}'''
 """
 
-import
-  macros, strutils
+import macros
 
 macro outterMacro*(n, blck: untyped): untyped =
   let n = callsite()
diff --git a/tests/metatype/tymatrix.nim b/tests/metatype/tymatrix.nim
index 14c4d8c88..cf36bfa63 100644
--- a/tests/metatype/tymatrix.nim
+++ b/tests/metatype/tymatrix.nim
@@ -1,5 +1,3 @@
-import typetraits
-
 template reject(e) =
   static: assert(not compiles(e))
 
diff --git a/tests/misc/tbug511622.nim b/tests/misc/tbug511622.nim
index 4b30e96e6..1af6380ed 100644
--- a/tests/misc/tbug511622.nim
+++ b/tests/misc/tbug511622.nim
@@ -1,7 +1,7 @@
 discard """
   output: "3"
 """
-import StrUtils, Math
+import math
 
 proc FibonacciA(n: int): int64 =
   var fn = float64(n)
diff --git a/tools/niminst/niminst.nim b/tools/niminst/niminst.nim
index 1ea3870f2..558184904 100644
--- a/tools/niminst/niminst.nim
+++ b/tools/niminst/niminst.nim
@@ -14,7 +14,7 @@ when haveZipLib:
   import zipfiles
 
 import
-  os, osproc, strutils, parseopt, parsecfg, strtabs, streams, debcreation,
+  os, strutils, parseopt, parsecfg, strtabs, streams, debcreation,
   std / sha1
 
 const