diff --git a/tests/mini/bug26.d b/tests/mini/compile_bug26.d
similarity index 100%
rename from tests/mini/bug26.d
rename to tests/mini/compile_bug26.d
diff --git a/tests/mini/imports_1of2.d b/tests/mini/imports_1of2.d
deleted file mode 100644
index 87455e54..00000000
--- a/tests/mini/imports_1of2.d
+++ /dev/null
@@ -1,11 +0,0 @@
-module imports_1of2;
-
-import imports_2of2;
-
-void main()
-{
-    assert(func() == 42);
-    S s;
-    s.l = 32;
-    assert(s.l == 32);
-}
diff --git a/tests/mini/imports_2of2.d b/tests/mini/imports_2of2.d
deleted file mode 100644
index d2e39467..00000000
--- a/tests/mini/imports_2of2.d
+++ /dev/null
@@ -1,11 +0,0 @@
-module imports_2of2;
-
-int func()
-{
-    return 42;
-}
-
-struct S
-{
-    long l;
-}
diff --git a/tests/mini/bug57.d b/tests/mini/phobos/bug57.d
similarity index 100%
rename from tests/mini/bug57.d
rename to tests/mini/phobos/bug57.d
diff --git a/tests/mini/bug58.d b/tests/mini/phobos/bug58.d
similarity index 100%
rename from tests/mini/bug58.d
rename to tests/mini/phobos/bug58.d
diff --git a/tests/mini/bug66.d b/tests/mini/phobos/bug66.d
similarity index 100%
rename from tests/mini/bug66.d
rename to tests/mini/phobos/bug66.d
diff --git a/tests/mini/bug71.d b/tests/mini/phobos/bug71.d
similarity index 100%
rename from tests/mini/bug71.d
rename to tests/mini/phobos/bug71.d
diff --git a/tests/mini/bug79.d b/tests/mini/phobos/bug79.d
similarity index 100%
rename from tests/mini/bug79.d
rename to tests/mini/phobos/bug79.d
diff --git a/tests/mini/imports2.d b/tests/mini/phobos/imports2.d
similarity index 100%
rename from tests/mini/imports2.d
rename to tests/mini/phobos/imports2.d
diff --git a/tests/mini/stdiotest.d b/tests/mini/phobos/stdiotest.d
similarity index 100%
rename from tests/mini/stdiotest.d
rename to tests/mini/phobos/stdiotest.d
diff --git a/tests/mini/stdiotest2.d b/tests/mini/phobos/stdiotest2.d
similarity index 100%
rename from tests/mini/stdiotest2.d
rename to tests/mini/phobos/stdiotest2.d