diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index 17019cfd351..d270d72d526 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -554,6 +554,18 @@ sub collect_one_test_case($$$$$$$) {
       }
     }
 
+    if ( $tinfo->{'innodb_test'} )
+    {
+      # This is a test that need inndob
+      if ( $::mysqld_variables{'innodb'} eq "FALSE" )
+      {
+	# innodb is not supported, skip it
+	$tinfo->{'skip'}= 1;
+	$tinfo->{'comment'}= "No innodb support";
+	return;
+      }
+    }
+
   }
 }