diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index de5b6697e69..124ede14dbb 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -177,14 +177,12 @@ my @DEFAULT_SUITES= qw(
     maria-
     multi_source-
     optimizer_unfixed_bugs-
-    oqgraph-
     parts-
     percona-
     perfschema-
     plugins-
     roles-
     rpl-
-    sphinx-
     sys_vars-
     unit-
     vcol-
diff --git a/mysql-test/suite/oqgraph/basic.result b/storage/oqgraph/mysql-test/oqgraph/basic.result
similarity index 100%
rename from mysql-test/suite/oqgraph/basic.result
rename to storage/oqgraph/mysql-test/oqgraph/basic.result
diff --git a/mysql-test/suite/oqgraph/basic.test b/storage/oqgraph/mysql-test/oqgraph/basic.test
similarity index 100%
rename from mysql-test/suite/oqgraph/basic.test
rename to storage/oqgraph/mysql-test/oqgraph/basic.test
diff --git a/mysql-test/suite/oqgraph/boundary_conditions.result b/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result
similarity index 100%
rename from mysql-test/suite/oqgraph/boundary_conditions.result
rename to storage/oqgraph/mysql-test/oqgraph/boundary_conditions.result
diff --git a/mysql-test/suite/oqgraph/boundary_conditions.test b/storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test
similarity index 100%
rename from mysql-test/suite/oqgraph/boundary_conditions.test
rename to storage/oqgraph/mysql-test/oqgraph/boundary_conditions.test
diff --git a/mysql-test/suite/oqgraph/create_attr.result b/storage/oqgraph/mysql-test/oqgraph/create_attr.result
similarity index 100%
rename from mysql-test/suite/oqgraph/create_attr.result
rename to storage/oqgraph/mysql-test/oqgraph/create_attr.result
diff --git a/mysql-test/suite/oqgraph/create_attr.test b/storage/oqgraph/mysql-test/oqgraph/create_attr.test
similarity index 100%
rename from mysql-test/suite/oqgraph/create_attr.test
rename to storage/oqgraph/mysql-test/oqgraph/create_attr.test
diff --git a/mysql-test/suite/oqgraph/create_attr_legacy.result b/storage/oqgraph/mysql-test/oqgraph/create_attr_legacy.result
similarity index 100%
rename from mysql-test/suite/oqgraph/create_attr_legacy.result
rename to storage/oqgraph/mysql-test/oqgraph/create_attr_legacy.result
diff --git a/mysql-test/suite/oqgraph/create_attr_legacy.test b/storage/oqgraph/mysql-test/oqgraph/create_attr_legacy.test
similarity index 100%
rename from mysql-test/suite/oqgraph/create_attr_legacy.test
rename to storage/oqgraph/mysql-test/oqgraph/create_attr_legacy.test
diff --git a/mysql-test/suite/oqgraph/invalid_operations.result b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.result
similarity index 100%
rename from mysql-test/suite/oqgraph/invalid_operations.result
rename to storage/oqgraph/mysql-test/oqgraph/invalid_operations.result
diff --git a/mysql-test/suite/oqgraph/invalid_operations.test b/storage/oqgraph/mysql-test/oqgraph/invalid_operations.test
similarity index 100%
rename from mysql-test/suite/oqgraph/invalid_operations.test
rename to storage/oqgraph/mysql-test/oqgraph/invalid_operations.test
diff --git a/mysql-test/suite/oqgraph/isnull.result b/storage/oqgraph/mysql-test/oqgraph/isnull.result
similarity index 100%
rename from mysql-test/suite/oqgraph/isnull.result
rename to storage/oqgraph/mysql-test/oqgraph/isnull.result
diff --git a/mysql-test/suite/oqgraph/isnull.test b/storage/oqgraph/mysql-test/oqgraph/isnull.test
similarity index 100%
rename from mysql-test/suite/oqgraph/isnull.test
rename to storage/oqgraph/mysql-test/oqgraph/isnull.test
diff --git a/mysql-test/suite/oqgraph/legacy_upgrade.result b/storage/oqgraph/mysql-test/oqgraph/legacy_upgrade.result
similarity index 100%
rename from mysql-test/suite/oqgraph/legacy_upgrade.result
rename to storage/oqgraph/mysql-test/oqgraph/legacy_upgrade.result
diff --git a/mysql-test/suite/oqgraph/legacy_upgrade.test b/storage/oqgraph/mysql-test/oqgraph/legacy_upgrade.test
similarity index 100%
rename from mysql-test/suite/oqgraph/legacy_upgrade.test
rename to storage/oqgraph/mysql-test/oqgraph/legacy_upgrade.test
diff --git a/mysql-test/suite/oqgraph/regression_1133093.result b/storage/oqgraph/mysql-test/oqgraph/regression_1133093.result
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1133093.result
rename to storage/oqgraph/mysql-test/oqgraph/regression_1133093.result
diff --git a/mysql-test/suite/oqgraph/regression_1133093.test b/storage/oqgraph/mysql-test/oqgraph/regression_1133093.test
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1133093.test
rename to storage/oqgraph/mysql-test/oqgraph/regression_1133093.test
diff --git a/mysql-test/suite/oqgraph/regression_1134355.result b/storage/oqgraph/mysql-test/oqgraph/regression_1134355.result
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1134355.result
rename to storage/oqgraph/mysql-test/oqgraph/regression_1134355.result
diff --git a/mysql-test/suite/oqgraph/regression_1134355.test b/storage/oqgraph/mysql-test/oqgraph/regression_1134355.test
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1134355.test
rename to storage/oqgraph/mysql-test/oqgraph/regression_1134355.test
diff --git a/mysql-test/suite/oqgraph/regression_1195735.result b/storage/oqgraph/mysql-test/oqgraph/regression_1195735.result
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1195735.result
rename to storage/oqgraph/mysql-test/oqgraph/regression_1195735.result
diff --git a/mysql-test/suite/oqgraph/regression_1195735.test b/storage/oqgraph/mysql-test/oqgraph/regression_1195735.test
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1195735.test
rename to storage/oqgraph/mysql-test/oqgraph/regression_1195735.test
diff --git a/mysql-test/suite/oqgraph/regression_1196020.result b/storage/oqgraph/mysql-test/oqgraph/regression_1196020.result
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1196020.result
rename to storage/oqgraph/mysql-test/oqgraph/regression_1196020.result
diff --git a/mysql-test/suite/oqgraph/regression_1196020.test b/storage/oqgraph/mysql-test/oqgraph/regression_1196020.test
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1196020.test
rename to storage/oqgraph/mysql-test/oqgraph/regression_1196020.test
diff --git a/mysql-test/suite/oqgraph/regression_1196027.result b/storage/oqgraph/mysql-test/oqgraph/regression_1196027.result
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1196027.result
rename to storage/oqgraph/mysql-test/oqgraph/regression_1196027.result
diff --git a/mysql-test/suite/oqgraph/regression_1196027.test b/storage/oqgraph/mysql-test/oqgraph/regression_1196027.test
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1196027.test
rename to storage/oqgraph/mysql-test/oqgraph/regression_1196027.test
diff --git a/mysql-test/suite/oqgraph/regression_1196036.result b/storage/oqgraph/mysql-test/oqgraph/regression_1196036.result
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1196036.result
rename to storage/oqgraph/mysql-test/oqgraph/regression_1196036.result
diff --git a/mysql-test/suite/oqgraph/regression_1196036.test b/storage/oqgraph/mysql-test/oqgraph/regression_1196036.test
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1196036.test
rename to storage/oqgraph/mysql-test/oqgraph/regression_1196036.test
diff --git a/mysql-test/suite/oqgraph/regression_1213120.result b/storage/oqgraph/mysql-test/oqgraph/regression_1213120.result
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1213120.result
rename to storage/oqgraph/mysql-test/oqgraph/regression_1213120.result
diff --git a/mysql-test/suite/oqgraph/regression_1213120.test b/storage/oqgraph/mysql-test/oqgraph/regression_1213120.test
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1213120.test
rename to storage/oqgraph/mysql-test/oqgraph/regression_1213120.test
diff --git a/mysql-test/suite/oqgraph/regression_1233113.result b/storage/oqgraph/mysql-test/oqgraph/regression_1233113.result
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1233113.result
rename to storage/oqgraph/mysql-test/oqgraph/regression_1233113.result
diff --git a/mysql-test/suite/oqgraph/regression_1233113.test b/storage/oqgraph/mysql-test/oqgraph/regression_1233113.test
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_1233113.test
rename to storage/oqgraph/mysql-test/oqgraph/regression_1233113.test
diff --git a/mysql-test/suite/oqgraph/regression_796647.result b/storage/oqgraph/mysql-test/oqgraph/regression_796647.result
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_796647.result
rename to storage/oqgraph/mysql-test/oqgraph/regression_796647.result
diff --git a/mysql-test/suite/oqgraph/regression_796647.test b/storage/oqgraph/mysql-test/oqgraph/regression_796647.test
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_796647.test
rename to storage/oqgraph/mysql-test/oqgraph/regression_796647.test
diff --git a/mysql-test/suite/oqgraph/regression_796647b.result b/storage/oqgraph/mysql-test/oqgraph/regression_796647b.result
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_796647b.result
rename to storage/oqgraph/mysql-test/oqgraph/regression_796647b.result
diff --git a/mysql-test/suite/oqgraph/regression_796647b.test b/storage/oqgraph/mysql-test/oqgraph/regression_796647b.test
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_796647b.test
rename to storage/oqgraph/mysql-test/oqgraph/regression_796647b.test
diff --git a/mysql-test/suite/oqgraph/regression_796647c.result b/storage/oqgraph/mysql-test/oqgraph/regression_796647c.result
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_796647c.result
rename to storage/oqgraph/mysql-test/oqgraph/regression_796647c.result
diff --git a/mysql-test/suite/oqgraph/regression_796647c.test b/storage/oqgraph/mysql-test/oqgraph/regression_796647c.test
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_796647c.test
rename to storage/oqgraph/mysql-test/oqgraph/regression_796647c.test
diff --git a/mysql-test/suite/oqgraph/regression_drop_after.result b/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_drop_after.result
rename to storage/oqgraph/mysql-test/oqgraph/regression_drop_after.result
diff --git a/mysql-test/suite/oqgraph/regression_drop_after.test b/storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test
similarity index 100%
rename from mysql-test/suite/oqgraph/regression_drop_after.test
rename to storage/oqgraph/mysql-test/oqgraph/regression_drop_after.test
diff --git a/mysql-test/suite/oqgraph/social.result b/storage/oqgraph/mysql-test/oqgraph/social.result
similarity index 100%
rename from mysql-test/suite/oqgraph/social.result
rename to storage/oqgraph/mysql-test/oqgraph/social.result
diff --git a/mysql-test/suite/oqgraph/social.test b/storage/oqgraph/mysql-test/oqgraph/social.test
similarity index 100%
rename from mysql-test/suite/oqgraph/social.test
rename to storage/oqgraph/mysql-test/oqgraph/social.test
diff --git a/mysql-test/suite/oqgraph/suite.opt b/storage/oqgraph/mysql-test/oqgraph/suite.opt
similarity index 100%
rename from mysql-test/suite/oqgraph/suite.opt
rename to storage/oqgraph/mysql-test/oqgraph/suite.opt
diff --git a/mysql-test/suite/oqgraph/suite.pm b/storage/oqgraph/mysql-test/oqgraph/suite.pm
similarity index 89%
rename from mysql-test/suite/oqgraph/suite.pm
rename to storage/oqgraph/mysql-test/oqgraph/suite.pm
index 4e98aa9757c..172c71c0e4c 100644
--- a/mysql-test/suite/oqgraph/suite.pm
+++ b/storage/oqgraph/mysql-test/oqgraph/suite.pm
@@ -5,5 +5,7 @@ package My::Suite::OQGraph;
 return "No OQGraph" unless $ENV{HA_OQGRAPH_SO} or
                            $::mysqld_variables{'oqgraph'} eq "ON";
 
+sub is_default { 1 }
+
 bless { };
 
diff --git a/mysql-test/suite/sphinx/my.cnf b/storage/sphinx/mysql-test/sphinx/my.cnf
similarity index 100%
rename from mysql-test/suite/sphinx/my.cnf
rename to storage/sphinx/mysql-test/sphinx/my.cnf
diff --git a/mysql-test/suite/sphinx/sphinx.result b/storage/sphinx/mysql-test/sphinx/sphinx.result
similarity index 100%
rename from mysql-test/suite/sphinx/sphinx.result
rename to storage/sphinx/mysql-test/sphinx/sphinx.result
diff --git a/mysql-test/suite/sphinx/sphinx.test b/storage/sphinx/mysql-test/sphinx/sphinx.test
similarity index 100%
rename from mysql-test/suite/sphinx/sphinx.test
rename to storage/sphinx/mysql-test/sphinx/sphinx.test
diff --git a/mysql-test/suite/sphinx/suite.opt b/storage/sphinx/mysql-test/sphinx/suite.opt
similarity index 100%
rename from mysql-test/suite/sphinx/suite.opt
rename to storage/sphinx/mysql-test/sphinx/suite.opt
diff --git a/mysql-test/suite/sphinx/suite.pm b/storage/sphinx/mysql-test/sphinx/suite.pm
similarity index 99%
rename from mysql-test/suite/sphinx/suite.pm
rename to storage/sphinx/mysql-test/sphinx/suite.pm
index f9787d80aa3..e652b38338f 100644
--- a/mysql-test/suite/sphinx/suite.pm
+++ b/storage/sphinx/mysql-test/sphinx/suite.pm
@@ -113,6 +113,8 @@ sub servers {
   )
 }
 
+sub is_default { 1 }
+
 ############# return an object ######################
 bless { };
 
diff --git a/mysql-test/suite/sphinx/testdata.xml b/storage/sphinx/mysql-test/sphinx/testdata.xml
similarity index 100%
rename from mysql-test/suite/sphinx/testdata.xml
rename to storage/sphinx/mysql-test/sphinx/testdata.xml