diff --git a/containers-data.opam b/containers-data.opam
index 306808a0..281a00e6 100644
--- a/containers-data.opam
+++ b/containers-data.opam
@@ -7,7 +7,7 @@ license: "BSD-2"
 build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "build" "@doc" "-p" name ] {with-doc}
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "4.11"}
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test & arch != "x86_32" & arch != "arm32"}
 ]
 depends: [
   "ocaml" { >= "4.03.0" }
diff --git a/containers-thread.opam b/containers-thread.opam
index abeb1232..d0d4baab 100644
--- a/containers-thread.opam
+++ b/containers-thread.opam
@@ -7,7 +7,7 @@ synopsis: "An extension of containers for threading"
 build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "build" "@doc" "-p" name ] {with-doc}
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "4.11"}
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test}
 ]
 depends: [
   "ocaml" { >= "4.03.0" }
diff --git a/containers.opam b/containers.opam
index da055f36..14002208 100644
--- a/containers.opam
+++ b/containers.opam
@@ -8,7 +8,7 @@ synopsis: "A modular, clean and powerful extension of the OCaml standard library
 build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "build" "@doc" "-p" name ] {with-doc}
-  ["dune" "runtest" "-p" name "-j" jobs] {with-test & ocaml:version < "4.11"}
+  ["dune" "runtest" "-p" name "-j" jobs] {with-test & arch != "x86_32" & arch != "arm32"}
 ]
 depends: [
   "ocaml" { >= "4.03.0" }