diff --git a/tests/test-dirs/search/dune b/tests/test-dirs/search/dune
new file mode 100644
index 000000000..94800b26f
--- /dev/null
+++ b/tests/test-dirs/search/dune
@@ -0,0 +1,4 @@
+(cram
+ (applies_to :whole_subtree)
+ (enabled_if
+  (<> %{os_type} Win32)))
diff --git a/tests/test-dirs/polarity-search-comparison-to-search-by-type.t b/tests/test-dirs/search/polarity-search-comparison-to-search-by-type.t
similarity index 100%
rename from tests/test-dirs/polarity-search-comparison-to-search-by-type.t
rename to tests/test-dirs/search/polarity-search-comparison-to-search-by-type.t
diff --git a/tests/test-dirs/search-by-type-comparison-to-polarity-search.t b/tests/test-dirs/search/search-by-type-comparison-to-polarity-search.t
similarity index 100%
rename from tests/test-dirs/search-by-type-comparison-to-polarity-search.t
rename to tests/test-dirs/search/search-by-type-comparison-to-polarity-search.t
diff --git a/tests/test-dirs/search-by-type.t/context.ml b/tests/test-dirs/search/search-by-type.t/context.ml
similarity index 100%
rename from tests/test-dirs/search-by-type.t/context.ml
rename to tests/test-dirs/search/search-by-type.t/context.ml
diff --git a/tests/test-dirs/search-by-type.t/run.t b/tests/test-dirs/search/search-by-type.t/run.t
similarity index 100%
rename from tests/test-dirs/search-by-type.t/run.t
rename to tests/test-dirs/search/search-by-type.t/run.t