diff --git a/tests/core/dune b/tests/core/dune
index 89c12c06..4c4ce785 100644
--- a/tests/core/dune
+++ b/tests/core/dune
@@ -1,6 +1,6 @@
 (test
  (name t)
- (flags :standard -strict-sequence -warn-error -a+8 -open CCShims_)
+ (flags :standard -strict-sequence -warn-error -a+8)
  (modes (best exe))
  (package containers)
  (preprocess
diff --git a/tests/core/t_char.ml b/tests/core/t_char.ml
index 7b274da6..d8c5d971 100644
--- a/tests/core/t_char.ml
+++ b/tests/core/t_char.ml
@@ -7,4 +7,4 @@ eq None (of_int 257);;
 
 q
   (Q.string_of_size (Q.Gen.return 1))
-  (fun s -> CCShims_.Stdlib.( = ) (to_string s.[0]) s)
+  (fun s -> Stdlib.( = ) (to_string s.[0]) s)
diff --git a/tests/core/t_string.ml b/tests/core/t_string.ml
index 44d8dd72..b4612c38 100644
--- a/tests/core/t_string.ml
+++ b/tests/core/t_string.ml
@@ -1,7 +1,6 @@
 module T = (val Containers_testlib.make ~__FILE__ ())
 include T
-open CCString
-.Stdlib;;
+open CCString.Stdlib;;
 
 q Q.printable_string (fun s -> s = rev (rev s));;
 q Q.printable_string (fun s -> length s = length (rev s));;
@@ -315,7 +314,7 @@ eq ~printer:Q.Print.string "abde"
 ;;
 
 q Q.printable_string (fun s -> filter (fun _ -> true) s = s);;
-eq ~printer:Q.Print.string "abcde" (uniq CCShims_.Stdlib.( = ) "abbccdeeeee");;
+eq ~printer:Q.Print.string "abcde" (uniq Stdlib.( = ) "abbccdeeeee");;
 eq ~printer:CCFun.id "abc " (ltrim " abc ");;
 eq ~printer:CCFun.id " abc" (rtrim " abc ");;
 q Q.(printable_string) (fun s -> String.trim s = (s |> ltrim |> rtrim));;
diff --git a/tests/data/dune b/tests/data/dune
index 5fe1b318..ff73126d 100644
--- a/tests/data/dune
+++ b/tests/data/dune
@@ -1,6 +1,6 @@
 (test
  (name t)
- (flags :standard -strict-sequence -warn-error -a+8 -open CCShims_)
+ (flags :standard -strict-sequence -warn-error -a+8)
  (modes (best exe))
  (package containers-data)
  (libraries containers containers-data containers_testlib iter gen))
diff --git a/tests/thread/dune b/tests/thread/dune
index 6ed2aab9..e449f254 100644
--- a/tests/thread/dune
+++ b/tests/thread/dune
@@ -1,6 +1,6 @@
 (test
  (name t)
- (flags :standard -strict-sequence -warn-error -a+8 -open CCShims_)
+ (flags :standard -strict-sequence -warn-error -a+8)
  (modes (best exe))
  (package containers-thread)
  (libraries containers containers-thread containers_testlib iter threads))