diff --git a/mysql-test/include/have_innodb_plugin.inc b/mysql-test/include/have_innodb_plugin.inc
new file mode 100644
index 00000000000..99a79465f52
--- /dev/null
+++ b/mysql-test/include/have_innodb_plugin.inc
@@ -0,0 +1,4 @@
+disable_query_log;
+--require r/true.require
+SELECT (plugin_library LIKE 'ha_innodb_plugin%') AS `TRUE` FROM information_schema.plugins WHERE LOWER(plugin_name) = 'innodb' AND LOWER(plugin_status) = 'active';
+enable_query_log;
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 218701ff4a7..12ec9f2ceeb 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -70,7 +70,6 @@ my $skip_test_reg;
 
 # Related to adding InnoDB plugin combinations
 my $lib_innodb_plugin;
-my $do_innodb_plugin;
 
 # If "Quick collect", set to 1 once a test to run has been found.
 my $some_test_found;
@@ -114,9 +113,6 @@ sub collect_test_cases ($$$) {
 		 ["ha_innodb_plugin.dll", "ha_innodb_plugin.so",
 		  "ha_innodb_plugin.sl"],
 		 NOT_REQUIRED);
-  $do_innodb_plugin= ($::mysql_version_id >= 50100 &&
-		      !(IS_WINDOWS && $::opt_embedded_server) &&
-		      $lib_innodb_plugin);
 
   # If not reordering, we also shouldn't group by suites, unless
   # no test cases were named.
@@ -504,73 +500,6 @@ sub collect_one_suite($)
     }
   }
 
-  # ----------------------------------------------------------------------
-  # Testing InnoDB plugin.
-  # ----------------------------------------------------------------------
-  if ($do_innodb_plugin)
-  {
-    my @new_cases;
-    my $sep= (IS_WINDOWS) ? ';' : ':';
-
-    foreach my $test (@cases)
-    {
-      next if (!$test->{'innodb_test'});
-      # If skipped due to no builtin innodb, we can still run it with plugin
-      next if ($test->{'skip'} && $test->{comment} ne "No innodb support");
-      # Exceptions
-      next if ($test->{'name'} eq 'main.innodb'); # Failed with wrong errno (fk)
-      next if ($test->{'name'} eq 'main.index_merge_innodb'); # Explain diff
-      # innodb_file_per_table is rw with innodb_plugin
-      next if ($test->{'name'} eq 'sys_vars.innodb_file_per_table_basic');
-      # innodb_lock_wait_timeout is rw with innodb_plugin
-      next if ($test->{'name'} eq 'sys_vars.innodb_lock_wait_timeout_basic');
-      # Diff around innodb_thread_concurrency variable
-      next if ($test->{'name'} eq 'sys_vars.innodb_thread_concurrency_basic');
-      # Can't work with InnoPlug. Test framework needs to be re-designed.
-      next if ($test->{'name'} eq 'main.innodb_bug46000');
-      # Fails with innodb plugin
-      next if ($test->{'name'} eq 'main.innodb-autoinc');
-      # Fails with innodb plugin: r6185 Testcases changes not included
-      next if ($test->{'name'} eq 'main.innodb_bug44369');
-      # Fix for BUG47621 is not in InnoDB plugin
-      next if ($test->{'name'} eq 'main.innodb_bug21704');
-      next if ($test->{'name'} eq 'main.innodb_bug47621');
-      # Copy test options
-      my $new_test= My::Test->new();
-      while (my ($key, $value) = each(%$test))
-      {
-        if (ref $value eq "ARRAY")
-        {
-          push(@{$new_test->{$key}}, @$value);
-        }
-        else
-        {
-          $new_test->{$key}= $value unless ($key eq 'skip');
-        }
-      }
-      my $plugin_filename= basename($lib_innodb_plugin);
-      my $plugin_list= "innodb=$plugin_filename" . $sep . "innodb_locks=$plugin_filename";
-      push(@{$new_test->{master_opt}}, '--ignore-builtin-innodb');
-      push(@{$new_test->{master_opt}}, '--plugin-dir=' . dirname($lib_innodb_plugin));
-      push(@{$new_test->{master_opt}}, "--plugin_load=$plugin_list");
-      push(@{$new_test->{slave_opt}}, '--ignore-builtin-innodb');
-      push(@{$new_test->{slave_opt}}, '--plugin-dir=' . dirname($lib_innodb_plugin));
-      push(@{$new_test->{slave_opt}}, "--plugin_load=$plugin_list");
-      if ($new_test->{combination})
-      {
-        $new_test->{combination}.= '+innodb_plugin';
-      }
-      else
-      {
-        $new_test->{combination}= 'innodb_plugin';
-      }
-      push(@new_cases, $new_test);
-    }
-    push(@cases, @new_cases);
-  }
-  # ----------------------------------------------------------------------
-  # End of testing InnoDB plugin.
-  # ----------------------------------------------------------------------
   optimize_cases(\@cases);
   #print_testcases(@cases);
 
@@ -1005,11 +934,39 @@ sub collect_one_test_case {
     {
       # innodb is not supported, skip it
       $tinfo->{'skip'}= 1;
-      # This comment is checked for running with innodb plugin (see above),
-      # please keep that in mind if changing the text.
       $tinfo->{'comment'}= "No innodb support";
-      # But continue processing if we may run it with innodb plugin
-      return $tinfo unless $do_innodb_plugin;
+      return $tinfo;
+    }
+  }
+  elsif ( $tinfo->{'innodb_plugin_test'} )
+  {
+    # This is a test that needs the innodb plugin
+    if ( $::mysqld_variables{'innodb'} eq "OFF" ||
+         ! exists $::mysqld_variables{'innodb'} )
+    {
+      # innodb plugin is not supported, skip it
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "No innodb plugin support";
+      return $tinfo;
+    }
+
+    my $sep= (IS_WINDOWS) ? ';' : ':';
+    my $plugin_filename= basename($lib_innodb_plugin);
+    my $plugin_list=
+      "innodb=$plugin_filename$sep" .
+      "innodb_trx=$plugin_filename$sep" .
+      "innodb_locks=$plugin_filename$sep" .
+      "innodb_lock_waits=$plugin_filename$sep" .
+      "innodb_cmp=$plugin_filename$sep" .
+      "innodb_cmp_reset=$plugin_filename$sep" .
+      "innodb_cmpmem=$plugin_filename$sep" .
+      "innodb_cmpmem_reset=$plugin_filename";
+
+    foreach my $k ('master_opt', 'slave_opt') 
+    {
+      push(@{$tinfo->{$k}}, '--ignore-builtin-innodb');
+      push(@{$tinfo->{$k}}, '--plugin-dir=' . dirname($lib_innodb_plugin));
+      push(@{$tinfo->{$k}}, "--plugin-load=$plugin_list");
     }
   }
   else
@@ -1137,6 +1094,7 @@ my @tags=
  ["include/have_log_bin.inc", "need_binlog", 1],
 
  ["include/have_innodb.inc", "innodb_test", 1],
+ ["include/have_innodb_plugin.inc", "innodb_plugin_test", 1],
  ["include/big_test.inc", "big_test", 1],
  ["include/have_debug.inc", "need_debug", 1],
  ["include/have_ndb.inc", "ndb_test", 1],
diff --git a/storage/innodb_plugin/mysql-test/ctype_innodb_like.inc b/mysql-test/suite/innodb_plugin/include/ctype_innodb_like.inc
similarity index 100%
rename from storage/innodb_plugin/mysql-test/ctype_innodb_like.inc
rename to mysql-test/suite/innodb_plugin/include/ctype_innodb_like.inc
diff --git a/storage/innodb_plugin/mysql-test/have_innodb.inc b/mysql-test/suite/innodb_plugin/include/have_innodb.inc
similarity index 100%
rename from storage/innodb_plugin/mysql-test/have_innodb.inc
rename to mysql-test/suite/innodb_plugin/include/have_innodb.inc
diff --git a/storage/innodb_plugin/mysql-test/innodb-index.inc b/mysql-test/suite/innodb_plugin/include/innodb-index.inc
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-index.inc
rename to mysql-test/suite/innodb_plugin/include/innodb-index.inc
diff --git a/storage/innodb_plugin/mysql-test/innodb_trx_weight.inc b/mysql-test/suite/innodb_plugin/include/innodb_trx_weight.inc
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_trx_weight.inc
rename to mysql-test/suite/innodb_plugin/include/innodb_trx_weight.inc
diff --git a/storage/innodb_plugin/mysql-test/innodb-analyze.result b/mysql-test/suite/innodb_plugin/r/innodb-analyze.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-analyze.result
rename to mysql-test/suite/innodb_plugin/r/innodb-analyze.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-autoinc-44030.result b/mysql-test/suite/innodb_plugin/r/innodb-autoinc-44030.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-autoinc-44030.result
rename to mysql-test/suite/innodb_plugin/r/innodb-autoinc-44030.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-autoinc.result b/mysql-test/suite/innodb_plugin/r/innodb-autoinc.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-autoinc.result
rename to mysql-test/suite/innodb_plugin/r/innodb-autoinc.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-consistent.result b/mysql-test/suite/innodb_plugin/r/innodb-consistent.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-consistent.result
rename to mysql-test/suite/innodb_plugin/r/innodb-consistent.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-index.result b/mysql-test/suite/innodb_plugin/r/innodb-index.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-index.result
rename to mysql-test/suite/innodb_plugin/r/innodb-index.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-index_ucs2.result b/mysql-test/suite/innodb_plugin/r/innodb-index_ucs2.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-index_ucs2.result
rename to mysql-test/suite/innodb_plugin/r/innodb-index_ucs2.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-lock.result b/mysql-test/suite/innodb_plugin/r/innodb-lock.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-lock.result
rename to mysql-test/suite/innodb_plugin/r/innodb-lock.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-replace.result b/mysql-test/suite/innodb_plugin/r/innodb-replace.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-replace.result
rename to mysql-test/suite/innodb_plugin/r/innodb-replace.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-semi-consistent.result b/mysql-test/suite/innodb_plugin/r/innodb-semi-consistent.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-semi-consistent.result
rename to mysql-test/suite/innodb_plugin/r/innodb-semi-consistent.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-timeout.result b/mysql-test/suite/innodb_plugin/r/innodb-timeout.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-timeout.result
rename to mysql-test/suite/innodb_plugin/r/innodb-timeout.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.result b/mysql-test/suite/innodb_plugin/r/innodb-use-sys-malloc.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.result
rename to mysql-test/suite/innodb_plugin/r/innodb-use-sys-malloc.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-zip.result b/mysql-test/suite/innodb_plugin/r/innodb-zip.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-zip.result
rename to mysql-test/suite/innodb_plugin/r/innodb-zip.result
diff --git a/storage/innodb_plugin/mysql-test/innodb.result b/mysql-test/suite/innodb_plugin/r/innodb.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb.result
rename to mysql-test/suite/innodb_plugin/r/innodb.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug21704.result b/mysql-test/suite/innodb_plugin/r/innodb_bug21704.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug21704.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug21704.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug34053.result b/mysql-test/suite/innodb_plugin/r/innodb_bug34053.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug34053.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug34053.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug34300.result b/mysql-test/suite/innodb_plugin/r/innodb_bug34300.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug34300.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug34300.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug35220.result b/mysql-test/suite/innodb_plugin/r/innodb_bug35220.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug35220.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug35220.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug36169.result b/mysql-test/suite/innodb_plugin/r/innodb_bug36169.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug36169.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug36169.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug36172.result b/mysql-test/suite/innodb_plugin/r/innodb_bug36172.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug36172.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug36172.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug38231.result b/mysql-test/suite/innodb_plugin/r/innodb_bug38231.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug38231.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug38231.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug39438.result b/mysql-test/suite/innodb_plugin/r/innodb_bug39438.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug39438.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug39438.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug40360.result b/mysql-test/suite/innodb_plugin/r/innodb_bug40360.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug40360.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug40360.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug40565.result b/mysql-test/suite/innodb_plugin/r/innodb_bug40565.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug40565.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug40565.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug41904.result b/mysql-test/suite/innodb_plugin/r/innodb_bug41904.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug41904.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug41904.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.result b/mysql-test/suite/innodb_plugin/r/innodb_bug42101-nonzero.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug42101-nonzero.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug42101.result b/mysql-test/suite/innodb_plugin/r/innodb_bug42101.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug42101.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug42101.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug44032.result b/mysql-test/suite/innodb_plugin/r/innodb_bug44032.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug44032.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug44032.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug44369.result b/mysql-test/suite/innodb_plugin/r/innodb_bug44369.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug44369.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug44369.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug44571.result b/mysql-test/suite/innodb_plugin/r/innodb_bug44571.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug44571.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug44571.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug45357.result b/mysql-test/suite/innodb_plugin/r/innodb_bug45357.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug45357.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug45357.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug46000.result b/mysql-test/suite/innodb_plugin/r/innodb_bug46000.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug46000.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug46000.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug46676.result b/mysql-test/suite/innodb_plugin/r/innodb_bug46676.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug46676.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug46676.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug47167.result b/mysql-test/suite/innodb_plugin/r/innodb_bug47167.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug47167.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug47167.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug47621.result b/mysql-test/suite/innodb_plugin/r/innodb_bug47621.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug47621.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug47621.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug47622.result b/mysql-test/suite/innodb_plugin/r/innodb_bug47622.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug47622.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug47622.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug47777.result b/mysql-test/suite/innodb_plugin/r/innodb_bug47777.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug47777.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug47777.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug51378.result b/mysql-test/suite/innodb_plugin/r/innodb_bug51378.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug51378.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug51378.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug51920.result b/mysql-test/suite/innodb_plugin/r/innodb_bug51920.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug51920.result
rename to mysql-test/suite/innodb_plugin/r/innodb_bug51920.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_file_format.result b/mysql-test/suite/innodb_plugin/r/innodb_file_format.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_file_format.result
rename to mysql-test/suite/innodb_plugin/r/innodb_file_format.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_information_schema.result b/mysql-test/suite/innodb_plugin/r/innodb_information_schema.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_information_schema.result
rename to mysql-test/suite/innodb_plugin/r/innodb_information_schema.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_trx_weight.result b/mysql-test/suite/innodb_plugin/r/innodb_trx_weight.result
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_trx_weight.result
rename to mysql-test/suite/innodb_plugin/r/innodb_trx_weight.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-analyze.test b/mysql-test/suite/innodb_plugin/t/innodb-analyze.test
similarity index 97%
rename from storage/innodb_plugin/mysql-test/innodb-analyze.test
rename to mysql-test/suite/innodb_plugin/t/innodb-analyze.test
index 9bdb9db697c..a79c36850dd 100644
--- a/storage/innodb_plugin/mysql-test/innodb-analyze.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-analyze.test
@@ -3,7 +3,7 @@
 # different values of the parameter innodb_stats_sample_pages.
 #
 
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 # we care only that the following SQL commands do not produce errors
 # and do not crash the server
diff --git a/storage/innodb_plugin/mysql-test/innodb-autoinc-44030.test b/mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
similarity index 96%
rename from storage/innodb_plugin/mysql-test/innodb-autoinc-44030.test
rename to mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
index af2e3015280..5db807ca835 100644
--- a/storage/innodb_plugin/mysql-test/innodb-autoinc-44030.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-autoinc-44030.test
@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
 
diff --git a/storage/innodb_plugin/mysql-test/innodb-autoinc.test b/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
similarity index 99%
rename from storage/innodb_plugin/mysql-test/innodb-autoinc.test
rename to mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
index ef0359b78b0..74e71b21a2b 100644
--- a/storage/innodb_plugin/mysql-test/innodb-autoinc.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-autoinc.test
@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
 
diff --git a/storage/innodb_plugin/mysql-test/innodb-consistent-master.opt b/mysql-test/suite/innodb_plugin/t/innodb-consistent-master.opt
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-consistent-master.opt
rename to mysql-test/suite/innodb_plugin/t/innodb-consistent-master.opt
diff --git a/storage/innodb_plugin/mysql-test/innodb-consistent.test b/mysql-test/suite/innodb_plugin/t/innodb-consistent.test
similarity index 96%
rename from storage/innodb_plugin/mysql-test/innodb-consistent.test
rename to mysql-test/suite/innodb_plugin/t/innodb-consistent.test
index bf829a74ea2..475b506525e 100644
--- a/storage/innodb_plugin/mysql-test/innodb-consistent.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-consistent.test
@@ -1,5 +1,5 @@
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 --disable_warnings
 drop table if exists t1;
diff --git a/storage/innodb_plugin/mysql-test/innodb-index.test b/mysql-test/suite/innodb_plugin/t/innodb-index.test
similarity index 99%
rename from storage/innodb_plugin/mysql-test/innodb-index.test
rename to mysql-test/suite/innodb_plugin/t/innodb-index.test
index 154ab63677a..717c7d4e032 100644
--- a/storage/innodb_plugin/mysql-test/innodb-index.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-index.test
@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 
@@ -163,7 +163,7 @@ select * from t2;
 drop table t2,t4,t3,t1;
 
 -- let charset = utf8
--- source include/innodb-index.inc
+-- source suite/innodb_plugin/include/innodb-index.inc
 
 create table t1(a int not null, b int) engine = innodb;
 insert into t1 values (1,1),(1,1),(1,1),(1,1);
diff --git a/storage/innodb_plugin/mysql-test/innodb-index_ucs2.test b/mysql-test/suite/innodb_plugin/t/innodb-index_ucs2.test
similarity index 68%
rename from storage/innodb_plugin/mysql-test/innodb-index_ucs2.test
rename to mysql-test/suite/innodb_plugin/t/innodb-index_ucs2.test
index fff9a4da1a8..c1e5a04a426 100644
--- a/storage/innodb_plugin/mysql-test/innodb-index_ucs2.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-index_ucs2.test
@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 -- source include/have_ucs2.inc
 
 -- let charset = ucs2
diff --git a/storage/innodb_plugin/mysql-test/innodb-lock.test b/mysql-test/suite/innodb_plugin/t/innodb-lock.test
similarity index 97%
rename from storage/innodb_plugin/mysql-test/innodb-lock.test
rename to mysql-test/suite/innodb_plugin/t/innodb-lock.test
index eacf7e562be..20467236b1c 100644
--- a/storage/innodb_plugin/mysql-test/innodb-lock.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-lock.test
@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 #
 # Check and select innodb lock type
diff --git a/storage/innodb_plugin/mysql-test/innodb-master.opt b/mysql-test/suite/innodb_plugin/t/innodb-master.opt
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-master.opt
rename to mysql-test/suite/innodb_plugin/t/innodb-master.opt
diff --git a/storage/innodb_plugin/mysql-test/innodb-replace.test b/mysql-test/suite/innodb_plugin/t/innodb-replace.test
similarity index 92%
rename from storage/innodb_plugin/mysql-test/innodb-replace.test
rename to mysql-test/suite/innodb_plugin/t/innodb-replace.test
index 8c3aacde5e8..91019a4db16 100644
--- a/storage/innodb_plugin/mysql-test/innodb-replace.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-replace.test
@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 # embedded server ignores 'delayed', so skip this
 -- source include/not_embedded.inc
 
diff --git a/storage/innodb_plugin/mysql-test/innodb-semi-consistent-master.opt b/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent-master.opt
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-semi-consistent-master.opt
rename to mysql-test/suite/innodb_plugin/t/innodb-semi-consistent-master.opt
diff --git a/storage/innodb_plugin/mysql-test/innodb-semi-consistent.test b/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent.test
similarity index 97%
rename from storage/innodb_plugin/mysql-test/innodb-semi-consistent.test
rename to mysql-test/suite/innodb_plugin/t/innodb-semi-consistent.test
index 61ad7815ca9..00131ffdf54 100644
--- a/storage/innodb_plugin/mysql-test/innodb-semi-consistent.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-semi-consistent.test
@@ -1,5 +1,5 @@
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 --disable_warnings
 drop table if exists t1;
diff --git a/storage/innodb_plugin/mysql-test/innodb-timeout.test b/mysql-test/suite/innodb_plugin/t/innodb-timeout.test
similarity index 96%
rename from storage/innodb_plugin/mysql-test/innodb-timeout.test
rename to mysql-test/suite/innodb_plugin/t/innodb-timeout.test
index f23fe3cff2d..34eda7279b2 100644
--- a/storage/innodb_plugin/mysql-test/innodb-timeout.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-timeout.test
@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 let $timeout=`select @@innodb_lock_wait_timeout`;
 set global innodb_lock_wait_timeout=42;
diff --git a/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc-master.opt b/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc-master.opt
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-use-sys-malloc-master.opt
rename to mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc-master.opt
diff --git a/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.test b/mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc.test
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.test
rename to mysql-test/suite/innodb_plugin/t/innodb-use-sys-malloc.test
diff --git a/storage/innodb_plugin/mysql-test/innodb-zip.test b/mysql-test/suite/innodb_plugin/t/innodb-zip.test
similarity index 99%
rename from storage/innodb_plugin/mysql-test/innodb-zip.test
rename to mysql-test/suite/innodb_plugin/t/innodb-zip.test
index fdb9b89e37a..3d7690612c1 100644
--- a/storage/innodb_plugin/mysql-test/innodb-zip.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb-zip.test
@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 let $per_table=`select @@innodb_file_per_table`;
 let $format=`select @@innodb_file_format`;
diff --git a/storage/innodb_plugin/mysql-test/innodb.test b/mysql-test/suite/innodb_plugin/t/innodb.test
similarity index 99%
rename from storage/innodb_plugin/mysql-test/innodb.test
rename to mysql-test/suite/innodb_plugin/t/innodb.test
index 9f9766acd82..e3d68bf5616 100644
--- a/storage/innodb_plugin/mysql-test/innodb.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb.test
@@ -13,7 +13,7 @@
 #                                                                     #
 #######################################################################
 
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 let $MYSQLD_DATADIR= `select @@datadir`;
 
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug21704.test b/mysql-test/suite/innodb_plugin/t/innodb_bug21704.test
similarity index 98%
rename from storage/innodb_plugin/mysql-test/innodb_bug21704.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug21704.test
index c649b61034c..9adf3239dcd 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug21704.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug21704.test
@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 --echo #
 --echo # Bug#21704: Renaming column does not update FK definition.
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug34053.test b/mysql-test/suite/innodb_plugin/t/innodb_bug34053.test
similarity index 97%
rename from storage/innodb_plugin/mysql-test/innodb_bug34053.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug34053.test
index b935e45c06d..78ec9afa688 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug34053.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug34053.test
@@ -3,7 +3,7 @@
 #
 
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 SET storage_engine=InnoDB;
 
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug34300.test b/mysql-test/suite/innodb_plugin/t/innodb_bug34300.test
similarity index 94%
rename from storage/innodb_plugin/mysql-test/innodb_bug34300.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug34300.test
index 68c385fd72a..d91ce205042 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug34300.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug34300.test
@@ -3,7 +3,7 @@
 # http://bugs.mysql.com/34300
 #
 
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 -- disable_query_log
 -- disable_result_log
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug35220.test b/mysql-test/suite/innodb_plugin/t/innodb_bug35220.test
similarity index 90%
rename from storage/innodb_plugin/mysql-test/innodb_bug35220.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug35220.test
index 26f7d6b1ddd..30175097c68 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug35220.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug35220.test
@@ -3,7 +3,7 @@
 # http://bugs.mysql.com/35220
 #
 
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 SET storage_engine=InnoDB;
 
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug36169.test b/mysql-test/suite/innodb_plugin/t/innodb_bug36169.test
similarity index 99%
rename from storage/innodb_plugin/mysql-test/innodb_bug36169.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug36169.test
index 5bf55193b5c..cb09192c34a 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug36169.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug36169.test
@@ -3,7 +3,7 @@
 # http://bugs.mysql.com/36169
 #
 
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 let $file_format=`select @@innodb_file_format`;
 let $file_per_table=`select @@innodb_file_per_table`;
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug36172.test b/mysql-test/suite/innodb_plugin/t/innodb_bug36172.test
similarity index 99%
rename from storage/innodb_plugin/mysql-test/innodb_bug36172.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug36172.test
index c6c4e6fae47..fbd6d5605df 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug36172.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug36172.test
@@ -3,7 +3,7 @@
 #
 
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 SET storage_engine=InnoDB;
 
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug38231.test b/mysql-test/suite/innodb_plugin/t/innodb_bug38231.test
similarity index 98%
rename from storage/innodb_plugin/mysql-test/innodb_bug38231.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug38231.test
index 1611cb56203..be588474bc1 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug38231.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug38231.test
@@ -3,7 +3,7 @@
 # http://bugs.mysql.com/38231
 #
 
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 SET storage_engine=InnoDB;
 
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug39438-master.opt b/mysql-test/suite/innodb_plugin/t/innodb_bug39438-master.opt
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug39438-master.opt
rename to mysql-test/suite/innodb_plugin/t/innodb_bug39438-master.opt
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug39438.test b/mysql-test/suite/innodb_plugin/t/innodb_bug39438.test
similarity index 98%
rename from storage/innodb_plugin/mysql-test/innodb_bug39438.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug39438.test
index 52302871beb..879059bac0d 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug39438.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug39438.test
@@ -7,7 +7,7 @@
 # works with innodb_file_per_table.
 #
 
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 SET storage_engine=InnoDB;
 
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug40360.test b/mysql-test/suite/innodb_plugin/t/innodb_bug40360.test
similarity index 88%
rename from storage/innodb_plugin/mysql-test/innodb_bug40360.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug40360.test
index e88837aab4f..dbe61489760 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug40360.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug40360.test
@@ -3,7 +3,7 @@
 #
 
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 SET TX_ISOLATION='READ-COMMITTED';
 
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug40565.test b/mysql-test/suite/innodb_plugin/t/innodb_bug40565.test
similarity index 87%
rename from storage/innodb_plugin/mysql-test/innodb_bug40565.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug40565.test
index d7aa0fd514a..bcc61a1f6d2 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug40565.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug40565.test
@@ -1,5 +1,5 @@
 # Bug #40565 Update Query Results in "1 Row Affected" But Should Be "Zero Rows"
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 create table bug40565(value decimal(4,2)) engine=innodb;
 insert into bug40565 values (1), (null);
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug41904.test b/mysql-test/suite/innodb_plugin/t/innodb_bug41904.test
similarity index 87%
rename from storage/innodb_plugin/mysql-test/innodb_bug41904.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug41904.test
index 365c5229adc..867af04c490 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug41904.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug41904.test
@@ -3,7 +3,7 @@
 #
 
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 CREATE TABLE bug41904 (id INT PRIMARY KEY, uniquecol CHAR(15)) ENGINE=InnoDB;
 
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero-master.opt b/mysql-test/suite/innodb_plugin/t/innodb_bug42101-nonzero-master.opt
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero-master.opt
rename to mysql-test/suite/innodb_plugin/t/innodb_bug42101-nonzero-master.opt
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.test b/mysql-test/suite/innodb_plugin/t/innodb_bug42101-nonzero.test
similarity index 93%
rename from storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug42101-nonzero.test
index 685fdf20489..1216bf415b8 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug42101-nonzero.test
@@ -3,7 +3,7 @@
 # http://bugs.mysql.com/42101
 #
 
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 --error ER_WRONG_ARGUMENTS
 set global innodb_commit_concurrency=0;
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug42101.test b/mysql-test/suite/innodb_plugin/t/innodb_bug42101.test
similarity index 92%
rename from storage/innodb_plugin/mysql-test/innodb_bug42101.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug42101.test
index b6536490d48..3bbc1928299 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug42101.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug42101.test
@@ -3,7 +3,7 @@
 # http://bugs.mysql.com/42101
 #
 
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 set global innodb_commit_concurrency=0;
 select @@innodb_commit_concurrency;
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug44032.test b/mysql-test/suite/innodb_plugin/t/innodb_bug44032.test
similarity index 92%
rename from storage/innodb_plugin/mysql-test/innodb_bug44032.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug44032.test
index a963cb8b68f..1c0ec2f9d95 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug44032.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug44032.test
@@ -2,7 +2,7 @@
 # (btr_cur_update_in_place not invoked when updating from/to NULL;
 # the update is performed by delete and insert instead)
 
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 CREATE TABLE bug44032(c CHAR(3) CHARACTER SET UTF8) ROW_FORMAT=REDUNDANT
 ENGINE=InnoDB;
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug44369.test b/mysql-test/suite/innodb_plugin/t/innodb_bug44369.test
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug44369.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug44369.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug44571.test b/mysql-test/suite/innodb_plugin/t/innodb_bug44571.test
similarity index 94%
rename from storage/innodb_plugin/mysql-test/innodb_bug44571.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug44571.test
index 91b6722d8af..3f02a2206a9 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug44571.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug44571.test
@@ -4,7 +4,7 @@
 # Please also refer to related fix in
 # http://bugs.mysql.com/47621
 #
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 CREATE TABLE bug44571 (foo INT) ENGINE=InnoDB;
 ALTER TABLE bug44571 CHANGE foo bar INT;
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug45357.test b/mysql-test/suite/innodb_plugin/t/innodb_bug45357.test
similarity index 87%
rename from storage/innodb_plugin/mysql-test/innodb_bug45357.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug45357.test
index 81727f352dd..b5e177c2918 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug45357.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug45357.test
@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 set session transaction isolation level read committed;
 
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug46000.test b/mysql-test/suite/innodb_plugin/t/innodb_bug46000.test
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug46000.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug46000.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug46676.test b/mysql-test/suite/innodb_plugin/t/innodb_bug46676.test
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug46676.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug46676.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug47167.test b/mysql-test/suite/innodb_plugin/t/innodb_bug47167.test
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug47167.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug47167.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug47621.test b/mysql-test/suite/innodb_plugin/t/innodb_bug47621.test
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug47621.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug47621.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug47622.test b/mysql-test/suite/innodb_plugin/t/innodb_bug47622.test
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug47622.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug47622.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug47777.test b/mysql-test/suite/innodb_plugin/t/innodb_bug47777.test
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug47777.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug47777.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug51378.test b/mysql-test/suite/innodb_plugin/t/innodb_bug51378.test
similarity index 100%
rename from storage/innodb_plugin/mysql-test/innodb_bug51378.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug51378.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug51920.test b/mysql-test/suite/innodb_plugin/t/innodb_bug51920.test
similarity index 95%
rename from storage/innodb_plugin/mysql-test/innodb_bug51920.test
rename to mysql-test/suite/innodb_plugin/t/innodb_bug51920.test
index 05c884134be..b2e6b188959 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug51920.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug51920.test
@@ -2,7 +2,7 @@
 # Bug #51920: InnoDB connections in lock wait ignore KILL until timeout
 #
 -- source include/not_embedded.inc
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 CREATE TABLE bug51920 (i INT) ENGINE=InnoDB;
 INSERT INTO bug51920 VALUES (1);
diff --git a/storage/innodb_plugin/mysql-test/innodb_file_format.test b/mysql-test/suite/innodb_plugin/t/innodb_file_format.test
similarity index 95%
rename from storage/innodb_plugin/mysql-test/innodb_file_format.test
rename to mysql-test/suite/innodb_plugin/t/innodb_file_format.test
index d63c9b0228f..484a176c58b 100644
--- a/storage/innodb_plugin/mysql-test/innodb_file_format.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_file_format.test
@@ -1,4 +1,4 @@
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 select @@innodb_file_format;
 select @@innodb_file_format_check;
diff --git a/storage/innodb_plugin/mysql-test/innodb_information_schema.test b/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test
similarity index 98%
rename from storage/innodb_plugin/mysql-test/innodb_information_schema.test
rename to mysql-test/suite/innodb_plugin/t/innodb_information_schema.test
index fc1d38d8d14..25255e0b2a9 100644
--- a/storage/innodb_plugin/mysql-test/innodb_information_schema.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_information_schema.test
@@ -3,7 +3,7 @@
 # INFORMATION_SCHEMA.innodb_locks.lock_data
 #
 
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 -- disable_query_log
 -- disable_result_log
diff --git a/storage/innodb_plugin/mysql-test/innodb_trx_weight.test b/mysql-test/suite/innodb_plugin/t/innodb_trx_weight.test
similarity index 89%
rename from storage/innodb_plugin/mysql-test/innodb_trx_weight.test
rename to mysql-test/suite/innodb_plugin/t/innodb_trx_weight.test
index b72eaad345f..3d08959b2ea 100644
--- a/storage/innodb_plugin/mysql-test/innodb_trx_weight.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb_trx_weight.test
@@ -6,7 +6,7 @@
 # be heavier than ones that had not.
 #
 
--- source include/have_innodb.inc
+-- source include/have_innodb_plugin.inc
 
 SET storage_engine=InnoDB;
 
@@ -65,21 +65,21 @@ INSERT INTO t3 SELECT * FROM t3;
 -- let $con2_extra_sql = SELECT * FROM t3 FOR UPDATE
 -- let $con2_extra_sql_present = 1
 -- let $con1_should_be_rolledback = 1
--- source include/innodb_trx_weight.inc
+-- source suite/innodb_plugin/include/innodb_trx_weight.inc
 
 -- let $con1_extra_sql = INSERT INTO t4 VALUES (1), (1)
 -- let $con1_extra_sql_present = 1
 -- let $con2_extra_sql = SELECT * FROM t3 FOR UPDATE
 -- let $con2_extra_sql_present = 1
 -- let $con1_should_be_rolledback = 1
--- source include/innodb_trx_weight.inc
+-- source suite/innodb_plugin/include/innodb_trx_weight.inc
 
 -- let $con1_extra_sql = INSERT INTO t4 VALUES (1), (1), (1), (1), (1), (1)
 -- let $con1_extra_sql_present = 1
 -- let $con2_extra_sql = SELECT * FROM t3 FOR UPDATE
 -- let $con2_extra_sql_present = 1
 -- let $con1_should_be_rolledback = 0
--- source include/innodb_trx_weight.inc
+-- source suite/innodb_plugin/include/innodb_trx_weight.inc
 
 # test weight when non-transactional tables are edited
 
@@ -88,14 +88,14 @@ INSERT INTO t3 SELECT * FROM t3;
 -- let $con2_extra_sql =
 -- let $con2_extra_sql_present = 0
 -- let $con1_should_be_rolledback = 0
--- source include/innodb_trx_weight.inc
+-- source suite/innodb_plugin/include/innodb_trx_weight.inc
 
 -- let $con1_extra_sql = INSERT INTO t4 VALUES (1), (1), (1)
 -- let $con1_extra_sql_present = 1
 -- let $con2_extra_sql = INSERT INTO t5_nontrans VALUES (1)
 -- let $con2_extra_sql_present = 1
 -- let $con1_should_be_rolledback = 1
--- source include/innodb_trx_weight.inc
+-- source suite/innodb_plugin/include/innodb_trx_weight.inc
 
 -- let $con1_extra_sql = INSERT INTO t4 VALUES (1), (1), (1)
 -- let $con1_extra_sql = $con1_extra_sql; INSERT INTO t5_nontrans VALUES (1)
@@ -103,6 +103,6 @@ INSERT INTO t3 SELECT * FROM t3;
 -- let $con2_extra_sql = INSERT INTO t5_nontrans VALUES (1)
 -- let $con2_extra_sql_present = 1
 -- let $con1_should_be_rolledback = 0
--- source include/innodb_trx_weight.inc
+-- source suite/innodb_plugin/include/innodb_trx_weight.inc
 
 DROP TABLE t1, t2, t3, t4, t5_nontrans;