diff --git a/stew.nimble b/stew.nimble
index d2fdbe2..1a52c25 100644
--- a/stew.nimble
+++ b/stew.nimble
@@ -7,7 +7,8 @@ description   = "Backports, standard library candidates and small utilities that
 license       = "Apache License 2.0"
 skipDirs      = @["tests"]
 
-requires "nim >= 1.2.0"
+requires "nim >= 1.2.0",
+         "unittest2"
 
 ### Helper functions
 proc test(args, path: string) =
diff --git a/tests/ranges/tbitranges.nim b/tests/ranges/tbitranges.nim
index 3589b61..2467cc4 100644
--- a/tests/ranges/tbitranges.nim
+++ b/tests/ranges/tbitranges.nim
@@ -1,5 +1,6 @@
 import
-  random, unittest,
+  random,
+  unittest2,
   ../../stew/ranges/bitranges, ../../stew/bitseqs
 
 proc randomBytes(n: int): seq[byte] =
diff --git a/tests/ranges/tstackarrays.nim b/tests/ranges/tstackarrays.nim
index 45c8966..18f4128 100644
--- a/tests/ranges/tstackarrays.nim
+++ b/tests/ranges/tstackarrays.nim
@@ -1,5 +1,6 @@
 import
-  unittest, math,
+  math,
+  unittest2,
   ../../stew/ptrops,
   ../../stew/ranges/[stackarrays]
 
diff --git a/tests/ranges/ttypedranges.nim b/tests/ranges/ttypedranges.nim
index d99c0b3..1e7ac6b 100644
--- a/tests/ranges/ttypedranges.nim
+++ b/tests/ranges/ttypedranges.nim
@@ -1,5 +1,6 @@
 import
-  unittest, sets,
+  sets,
+  unittest2,
   ../../stew/ranges/[typedranges, ptr_arith]
 
 suite "Typed ranges":
diff --git a/tests/test_arrayops.nim b/tests/test_arrayops.nim
index ccc8f2f..f1d7dc5 100644
--- a/tests/test_arrayops.nim
+++ b/tests/test_arrayops.nim
@@ -10,7 +10,7 @@
 {.used.}
 
 import
-  std/unittest,
+  unittest2,
   ../stew/arrayops
 
 suite "arrayops":
diff --git a/tests/test_assign2.nim b/tests/test_assign2.nim
index f5ebe26..1defc90 100644
--- a/tests/test_assign2.nim
+++ b/tests/test_assign2.nim
@@ -1,5 +1,5 @@
 import
-  std/unittest,
+  unittest2,
   ../stew/assign2
 
 suite "assign2":
diff --git a/tests/test_base10.nim b/tests/test_base10.nim
index 81a3ba2..4273abc 100644
--- a/tests/test_base10.nim
+++ b/tests/test_base10.nim
@@ -1,5 +1,6 @@
-import unittest
-import ../stew/base10
+import
+  unittest2,
+  ../stew/base10
 
 when defined(nimHasUsed): {.used.}
 
diff --git a/tests/test_base32.nim b/tests/test_base32.nim
index 7d34dfd..1372c0c 100644
--- a/tests/test_base32.nim
+++ b/tests/test_base32.nim
@@ -1,5 +1,6 @@
-import unittest
-import ../stew/base32
+import
+  unittest2,
+  ../stew/base32
 
 when defined(nimHasUsed): {.used.}
 
diff --git a/tests/test_base58.nim b/tests/test_base58.nim
index 8309cb3..becd7e6 100644
--- a/tests/test_base58.nim
+++ b/tests/test_base58.nim
@@ -1,5 +1,6 @@
-import unittest
-import ../stew/base58
+import
+  unittest2,
+  ../stew/base58
 
 when defined(nimHasUsed): {.used.}
 
diff --git a/tests/test_base64.nim b/tests/test_base64.nim
index 34d37c2..2e4d9c1 100644
--- a/tests/test_base64.nim
+++ b/tests/test_base64.nim
@@ -1,5 +1,6 @@
-import unittest
-import ../stew/[base64, byteutils]
+import
+  unittest2,
+  ../stew/[base64, byteutils]
 
 when defined(nimHasUsed): {.used.}
 
diff --git a/tests/test_bitops2.nim b/tests/test_bitops2.nim
index 1f81217..422b1fb 100644
--- a/tests/test_bitops2.nim
+++ b/tests/test_bitops2.nim
@@ -1,6 +1,6 @@
-import unittest
-
-import ../stew/bitops2
+import
+  unittest2,
+  ../stew/bitops2
 
 template test() =
   doAssert bitsof(8'u8) == 8
diff --git a/tests/test_bitseqs.nim b/tests/test_bitseqs.nim
index bbc06b9..f474e36 100644
--- a/tests/test_bitseqs.nim
+++ b/tests/test_bitseqs.nim
@@ -1,5 +1,6 @@
 import
-  unittest, strformat,
+  strformat,
+  unittest2,
   ../stew/[bitseqs]
 
 suite "Bit fields":
diff --git a/tests/test_byteutils.nim b/tests/test_byteutils.nim
index c1a6f7c..bdfe750 100644
--- a/tests/test_byteutils.nim
+++ b/tests/test_byteutils.nim
@@ -6,7 +6,7 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 import
-  std/unittest,
+  unittest2,
   ../stew/byteutils
 
 proc compilationTest {.exportc: "compilationTest".} =
diff --git a/tests/test_ctops.nim b/tests/test_ctops.nim
index f44d746..30c65f4 100644
--- a/tests/test_ctops.nim
+++ b/tests/test_ctops.nim
@@ -1,5 +1,6 @@
-import unittest
-import ../stew/ctops
+import
+  unittest2,
+  ../stew/ctops
 
 suite "Constant-time operations test suite":
   test "isEqual() test":
diff --git a/tests/test_endians2.nim b/tests/test_endians2.nim
index 5971f30..f0b0d98 100644
--- a/tests/test_endians2.nim
+++ b/tests/test_endians2.nim
@@ -1,6 +1,6 @@
-import unittest
-
-import ../stew/endians2
+import
+  unittest2,
+  ../stew/endians2
 
 template test() =
   doAssert 0x01'u8.toBytesBE == [0x01'u8]
diff --git a/tests/test_enums.nim b/tests/test_enums.nim
index 0b3ffb1..f76c0db 100644
--- a/tests/test_enums.nim
+++ b/tests/test_enums.nim
@@ -1,5 +1,6 @@
 import
-  unittest, typetraits,
+  typetraits,
+  unittest2,
   ../stew/enums
 
 suite "enums":
diff --git a/tests/test_interval_set.nim b/tests/test_interval_set.nim
index 726b963..5b363df 100644
--- a/tests/test_interval_set.nim
+++ b/tests/test_interval_set.nim
@@ -10,7 +10,7 @@
 # distributed except according to those terms.
 
 import
-  std/unittest,
+  unittest2,
   ../stew/interval_set
 
 const
diff --git a/tests/test_io2.nim b/tests/test_io2.nim
index c943fc7..7af968f 100644
--- a/tests/test_io2.nim
+++ b/tests/test_io2.nim
@@ -1,5 +1,6 @@
-import unittest
-import ../stew/io2
+import
+  unittest2,
+  ../stew/io2
 
 suite "OS Input/Output procedures test suite":
   test "getCurrentDir() test":
diff --git a/tests/test_keyed_queue.nim b/tests/test_keyed_queue.nim
index f7cb974..ad537f8 100644
--- a/tests/test_keyed_queue.nim
+++ b/tests/test_keyed_queue.nim
@@ -9,7 +9,8 @@
 # according to those terms.
 
 import
-  std/[algorithm, sequtils, strformat, strutils, tables, unittest],
+  std/[algorithm, sequtils, strformat, strutils, tables],
+  unittest2,
   ../stew/keyed_queue,
   ../stew/keyed_queue/kq_debug
 
diff --git a/tests/test_leb128.nim b/tests/test_leb128.nim
index 0f7d11a..9e72fc3 100644
--- a/tests/test_leb128.nim
+++ b/tests/test_leb128.nim
@@ -1,5 +1,6 @@
 import
-  unittest, random,
+  random,
+  unittest2,
   ../stew/[byteutils, leb128, results]
 
 const edgeValues = {
diff --git a/tests/test_macros.nim b/tests/test_macros.nim
index b7d2c88..9dfc059 100644
--- a/tests/test_macros.nim
+++ b/tests/test_macros.nim
@@ -1,8 +1,7 @@
 import
-  unittest,
+  unittest2,
   ../stew/shims/macros
 
-
 template unknown() {.pragma.}
 template zero() {.pragma.}
 template one(one: string) {.pragma.}
diff --git a/tests/test_objects.nim b/tests/test_objects.nim
index 78e7940..4e91960 100644
--- a/tests/test_objects.nim
+++ b/tests/test_objects.nim
@@ -1,5 +1,6 @@
 import
-  unittest, typetraits,
+  typetraits,
+  unittest2,
   ../stew/objects
 
 when defined(nimHasUsed):
diff --git a/tests/test_ptrops.nim b/tests/test_ptrops.nim
index f78da61..5ce71ef 100644
--- a/tests/test_ptrops.nim
+++ b/tests/test_ptrops.nim
@@ -7,9 +7,9 @@
 #
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-import unittest
-
-import ../stew/ptrops
+import
+  unittest2,
+  ../stew/ptrops
 
 var ints = [2, 3, 4]
 
diff --git a/tests/test_sequtils2.nim b/tests/test_sequtils2.nim
index 3c52f10..d6066c2 100644
--- a/tests/test_sequtils2.nim
+++ b/tests/test_sequtils2.nim
@@ -6,7 +6,7 @@
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
 import
-  std/unittest,
+  unittest2,
   ../stew/sequtils2
 
 suite "sequtils2":
diff --git a/tests/test_sets.nim b/tests/test_sets.nim
index 5ee6735..bd0b8c0 100644
--- a/tests/test_sets.nim
+++ b/tests/test_sets.nim
@@ -1,5 +1,5 @@
 import
-  unittest,
+  unittest2,
   ../stew/shims/sets
 
 suite "shims/sets":
diff --git a/tests/test_sorted_set.nim b/tests/test_sorted_set.nim
index 7583f67..dfa9c5a 100644
--- a/tests/test_sorted_set.nim
+++ b/tests/test_sorted_set.nim
@@ -10,8 +10,8 @@
 
 import
   std/[algorithm, sequtils, strformat, tables],
-  ../stew/sorted_set,
-  unittest
+  unittest2,
+  ../stew/sorted_set
 
 const
   keyList = [
diff --git a/tests/test_templateutils.nim b/tests/test_templateutils.nim
index b597739..67ce117 100644
--- a/tests/test_templateutils.nim
+++ b/tests/test_templateutils.nim
@@ -1,5 +1,5 @@
 import
-  unittest,
+  unittest2,
   ../stew/templateutils
 
 var computations = newSeq[string]()
diff --git a/tests/test_varints.nim b/tests/test_varints.nim
index fd4b0ab..b083903 100644
--- a/tests/test_varints.nim
+++ b/tests/test_varints.nim
@@ -1,5 +1,6 @@
 import
-  unittest, random,
+  random,
+  unittest2,
   ../stew/[varints, byteutils]
 
 const edgeValues = {
diff --git a/tests/test_winacl.nim b/tests/test_winacl.nim
index a86852c..bc98c77 100644
--- a/tests/test_winacl.nim
+++ b/tests/test_winacl.nim
@@ -1,5 +1,6 @@
-import std/unittest
-import ../stew/io2
+import
+  unittest2,
+  ../stew/io2
 
 when defined(windows):
   import ../stew/windows/acl