diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index e042390fe59..f0be8ead176 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -134,7 +134,7 @@ our $default_vardir;
 
 our $opt_usage;
 our $opt_suites;
-our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb"; # Default suites to run
+our $opt_suites_default= "main,binlog,rpl,rpl_ndb,ndb,maria"; # Default suites to run
 our $opt_script_debug= 0;  # Script debugging, enable with --script-debug
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
 
diff --git a/mysql-test/r/maria-autozerofill.result b/mysql-test/suite/maria/r/maria-autozerofill.result
similarity index 100%
rename from mysql-test/r/maria-autozerofill.result
rename to mysql-test/suite/maria/r/maria-autozerofill.result
diff --git a/mysql-test/r/maria-big.result b/mysql-test/suite/maria/r/maria-big.result
similarity index 100%
rename from mysql-test/r/maria-big.result
rename to mysql-test/suite/maria/r/maria-big.result
diff --git a/mysql-test/r/maria-big2.result b/mysql-test/suite/maria/r/maria-big2.result
similarity index 100%
rename from mysql-test/r/maria-big2.result
rename to mysql-test/suite/maria/r/maria-big2.result
diff --git a/mysql-test/r/maria-connect.result b/mysql-test/suite/maria/r/maria-connect.result
similarity index 100%
rename from mysql-test/r/maria-connect.result
rename to mysql-test/suite/maria/r/maria-connect.result
diff --git a/mysql-test/r/maria-gis-rtree-dynamic.result b/mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result
similarity index 100%
rename from mysql-test/r/maria-gis-rtree-dynamic.result
rename to mysql-test/suite/maria/r/maria-gis-rtree-dynamic.result
diff --git a/mysql-test/r/maria-gis-rtree-trans.result b/mysql-test/suite/maria/r/maria-gis-rtree-trans.result
similarity index 100%
rename from mysql-test/r/maria-gis-rtree-trans.result
rename to mysql-test/suite/maria/r/maria-gis-rtree-trans.result
diff --git a/mysql-test/r/maria-gis-rtree.result b/mysql-test/suite/maria/r/maria-gis-rtree.result
similarity index 100%
rename from mysql-test/r/maria-gis-rtree.result
rename to mysql-test/suite/maria/r/maria-gis-rtree.result
diff --git a/mysql-test/r/maria-mvcc.result b/mysql-test/suite/maria/r/maria-mvcc.result
similarity index 100%
rename from mysql-test/r/maria-mvcc.result
rename to mysql-test/suite/maria/r/maria-mvcc.result
diff --git a/mysql-test/r/maria-no-logging.result b/mysql-test/suite/maria/r/maria-no-logging.result
similarity index 100%
rename from mysql-test/r/maria-no-logging.result
rename to mysql-test/suite/maria/r/maria-no-logging.result
diff --git a/mysql-test/r/maria-page-checksum.result b/mysql-test/suite/maria/r/maria-page-checksum.result
similarity index 100%
rename from mysql-test/r/maria-page-checksum.result
rename to mysql-test/suite/maria/r/maria-page-checksum.result
diff --git a/mysql-test/r/maria-preload.result b/mysql-test/suite/maria/r/maria-preload.result
similarity index 100%
rename from mysql-test/r/maria-preload.result
rename to mysql-test/suite/maria/r/maria-preload.result
diff --git a/mysql-test/r/maria-purge.result b/mysql-test/suite/maria/r/maria-purge.result
similarity index 100%
rename from mysql-test/r/maria-purge.result
rename to mysql-test/suite/maria/r/maria-purge.result
diff --git a/mysql-test/r/maria-recover.result b/mysql-test/suite/maria/r/maria-recover.result
similarity index 100%
rename from mysql-test/r/maria-recover.result
rename to mysql-test/suite/maria/r/maria-recover.result
diff --git a/mysql-test/r/maria-recovery-big.result b/mysql-test/suite/maria/r/maria-recovery-big.result
similarity index 100%
rename from mysql-test/r/maria-recovery-big.result
rename to mysql-test/suite/maria/r/maria-recovery-big.result
diff --git a/mysql-test/r/maria-recovery-bitmap.result b/mysql-test/suite/maria/r/maria-recovery-bitmap.result
similarity index 100%
rename from mysql-test/r/maria-recovery-bitmap.result
rename to mysql-test/suite/maria/r/maria-recovery-bitmap.result
diff --git a/mysql-test/r/maria-recovery-rtree-ft.result b/mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
similarity index 100%
rename from mysql-test/r/maria-recovery-rtree-ft.result
rename to mysql-test/suite/maria/r/maria-recovery-rtree-ft.result
diff --git a/mysql-test/r/maria-recovery.result b/mysql-test/suite/maria/r/maria-recovery.result
similarity index 100%
rename from mysql-test/r/maria-recovery.result
rename to mysql-test/suite/maria/r/maria-recovery.result
diff --git a/mysql-test/r/maria-recovery2.result b/mysql-test/suite/maria/r/maria-recovery2.result
similarity index 100%
rename from mysql-test/r/maria-recovery2.result
rename to mysql-test/suite/maria/r/maria-recovery2.result
diff --git a/mysql-test/r/maria.result b/mysql-test/suite/maria/r/maria.result
similarity index 100%
rename from mysql-test/r/maria.result
rename to mysql-test/suite/maria/r/maria.result
diff --git a/mysql-test/r/maria2.result b/mysql-test/suite/maria/r/maria2.result
similarity index 100%
rename from mysql-test/r/maria2.result
rename to mysql-test/suite/maria/r/maria2.result
diff --git a/mysql-test/r/maria3.result b/mysql-test/suite/maria/r/maria3.result
similarity index 100%
rename from mysql-test/r/maria3.result
rename to mysql-test/suite/maria/r/maria3.result
diff --git a/mysql-test/r/maria_notembedded.result b/mysql-test/suite/maria/r/maria_notembedded.result
similarity index 100%
rename from mysql-test/r/maria_notembedded.result
rename to mysql-test/suite/maria/r/maria_notembedded.result
diff --git a/mysql-test/r/ps_maria.result b/mysql-test/suite/maria/r/ps_maria.result
similarity index 100%
rename from mysql-test/r/ps_maria.result
rename to mysql-test/suite/maria/r/ps_maria.result
diff --git a/mysql-test/t/maria-autozerofill.test b/mysql-test/suite/maria/t/maria-autozerofill.test
similarity index 100%
rename from mysql-test/t/maria-autozerofill.test
rename to mysql-test/suite/maria/t/maria-autozerofill.test
diff --git a/mysql-test/t/maria-big.test b/mysql-test/suite/maria/t/maria-big.test
similarity index 100%
rename from mysql-test/t/maria-big.test
rename to mysql-test/suite/maria/t/maria-big.test
diff --git a/mysql-test/t/maria-big2.test b/mysql-test/suite/maria/t/maria-big2.test
similarity index 100%
rename from mysql-test/t/maria-big2.test
rename to mysql-test/suite/maria/t/maria-big2.test
diff --git a/mysql-test/t/maria-connect.test b/mysql-test/suite/maria/t/maria-connect.test
similarity index 100%
rename from mysql-test/t/maria-connect.test
rename to mysql-test/suite/maria/t/maria-connect.test
diff --git a/mysql-test/t/maria-gis-rtree-dynamic.test b/mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test
similarity index 100%
rename from mysql-test/t/maria-gis-rtree-dynamic.test
rename to mysql-test/suite/maria/t/maria-gis-rtree-dynamic.test
diff --git a/mysql-test/t/maria-gis-rtree-trans.test b/mysql-test/suite/maria/t/maria-gis-rtree-trans.test
similarity index 100%
rename from mysql-test/t/maria-gis-rtree-trans.test
rename to mysql-test/suite/maria/t/maria-gis-rtree-trans.test
diff --git a/mysql-test/t/maria-gis-rtree.test b/mysql-test/suite/maria/t/maria-gis-rtree.test
similarity index 100%
rename from mysql-test/t/maria-gis-rtree.test
rename to mysql-test/suite/maria/t/maria-gis-rtree.test
diff --git a/mysql-test/t/maria-mvcc.test b/mysql-test/suite/maria/t/maria-mvcc.test
similarity index 100%
rename from mysql-test/t/maria-mvcc.test
rename to mysql-test/suite/maria/t/maria-mvcc.test
diff --git a/mysql-test/t/maria-no-logging.test b/mysql-test/suite/maria/t/maria-no-logging.test
similarity index 100%
rename from mysql-test/t/maria-no-logging.test
rename to mysql-test/suite/maria/t/maria-no-logging.test
diff --git a/mysql-test/t/maria-page-checksum.test b/mysql-test/suite/maria/t/maria-page-checksum.test
similarity index 100%
rename from mysql-test/t/maria-page-checksum.test
rename to mysql-test/suite/maria/t/maria-page-checksum.test
diff --git a/mysql-test/t/maria-preload.test b/mysql-test/suite/maria/t/maria-preload.test
similarity index 100%
rename from mysql-test/t/maria-preload.test
rename to mysql-test/suite/maria/t/maria-preload.test
diff --git a/mysql-test/t/maria-purge.test b/mysql-test/suite/maria/t/maria-purge.test
similarity index 100%
rename from mysql-test/t/maria-purge.test
rename to mysql-test/suite/maria/t/maria-purge.test
diff --git a/mysql-test/t/maria-recover-master.opt b/mysql-test/suite/maria/t/maria-recover-master.opt
similarity index 100%
rename from mysql-test/t/maria-recover-master.opt
rename to mysql-test/suite/maria/t/maria-recover-master.opt
diff --git a/mysql-test/t/maria-recover.test b/mysql-test/suite/maria/t/maria-recover.test
similarity index 100%
rename from mysql-test/t/maria-recover.test
rename to mysql-test/suite/maria/t/maria-recover.test
diff --git a/mysql-test/t/maria-recovery-big-master.opt b/mysql-test/suite/maria/t/maria-recovery-big-master.opt
similarity index 100%
rename from mysql-test/t/maria-recovery-big-master.opt
rename to mysql-test/suite/maria/t/maria-recovery-big-master.opt
diff --git a/mysql-test/t/maria-recovery-big.test b/mysql-test/suite/maria/t/maria-recovery-big.test
similarity index 100%
rename from mysql-test/t/maria-recovery-big.test
rename to mysql-test/suite/maria/t/maria-recovery-big.test
diff --git a/mysql-test/t/maria-recovery-bitmap-master.opt b/mysql-test/suite/maria/t/maria-recovery-bitmap-master.opt
similarity index 100%
rename from mysql-test/t/maria-recovery-bitmap-master.opt
rename to mysql-test/suite/maria/t/maria-recovery-bitmap-master.opt
diff --git a/mysql-test/t/maria-recovery-bitmap.test b/mysql-test/suite/maria/t/maria-recovery-bitmap.test
similarity index 100%
rename from mysql-test/t/maria-recovery-bitmap.test
rename to mysql-test/suite/maria/t/maria-recovery-bitmap.test
diff --git a/mysql-test/t/maria-recovery-master.opt b/mysql-test/suite/maria/t/maria-recovery-master.opt
similarity index 100%
rename from mysql-test/t/maria-recovery-master.opt
rename to mysql-test/suite/maria/t/maria-recovery-master.opt
diff --git a/mysql-test/t/maria-recovery-rtree-ft-master.opt b/mysql-test/suite/maria/t/maria-recovery-rtree-ft-master.opt
similarity index 100%
rename from mysql-test/t/maria-recovery-rtree-ft-master.opt
rename to mysql-test/suite/maria/t/maria-recovery-rtree-ft-master.opt
diff --git a/mysql-test/t/maria-recovery-rtree-ft.test b/mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
similarity index 100%
rename from mysql-test/t/maria-recovery-rtree-ft.test
rename to mysql-test/suite/maria/t/maria-recovery-rtree-ft.test
diff --git a/mysql-test/t/maria-recovery.test b/mysql-test/suite/maria/t/maria-recovery.test
similarity index 100%
rename from mysql-test/t/maria-recovery.test
rename to mysql-test/suite/maria/t/maria-recovery.test
diff --git a/mysql-test/t/maria-recovery2-master.opt b/mysql-test/suite/maria/t/maria-recovery2-master.opt
similarity index 100%
rename from mysql-test/t/maria-recovery2-master.opt
rename to mysql-test/suite/maria/t/maria-recovery2-master.opt
diff --git a/mysql-test/t/maria-recovery2.test b/mysql-test/suite/maria/t/maria-recovery2.test
similarity index 100%
rename from mysql-test/t/maria-recovery2.test
rename to mysql-test/suite/maria/t/maria-recovery2.test
diff --git a/mysql-test/t/maria.test b/mysql-test/suite/maria/t/maria.test
similarity index 100%
rename from mysql-test/t/maria.test
rename to mysql-test/suite/maria/t/maria.test
diff --git a/mysql-test/t/maria2.test b/mysql-test/suite/maria/t/maria2.test
similarity index 100%
rename from mysql-test/t/maria2.test
rename to mysql-test/suite/maria/t/maria2.test
diff --git a/mysql-test/t/maria3.test b/mysql-test/suite/maria/t/maria3.test
similarity index 100%
rename from mysql-test/t/maria3.test
rename to mysql-test/suite/maria/t/maria3.test
diff --git a/mysql-test/t/maria_notembedded.test b/mysql-test/suite/maria/t/maria_notembedded.test
similarity index 100%
rename from mysql-test/t/maria_notembedded.test
rename to mysql-test/suite/maria/t/maria_notembedded.test
diff --git a/mysql-test/t/ps_maria.test b/mysql-test/suite/maria/t/ps_maria.test
similarity index 100%
rename from mysql-test/t/ps_maria.test
rename to mysql-test/suite/maria/t/ps_maria.test