diff --git a/lib/ddl/simpletest/testddl.php b/lib/ddl/simpletest/testddl.php
index eae22e32932..a2670043229 100755
--- a/lib/ddl/simpletest/testddl.php
+++ b/lib/ddl/simpletest/testddl.php
@@ -1203,6 +1203,11 @@ class ddl_test extends UnitTestCase {
         }
 
         // Real file but invalid xml file
+        $devhack = false;
+        if (!empty($CFG->xmldbdisablenextprevchecking)) {
+            $CFG->xmldbdisablenextprevchecking = false;
+            $devhack = true;
+        }
         try {
             ob_start(); // hide debug warning
             $dbman->delete_tables_from_xmldb_file($CFG->libdir . '/ddl/simpletest/fixtures/invalid.xml');
@@ -1212,6 +1217,9 @@ class ddl_test extends UnitTestCase {
             ob_end_clean();
             $this->assertTrue($e instanceof moodle_exception);
         }
+        if ($devhack) {
+            $CFG->xmldbdisablenextprevchecking = true;
+        }
 
         // Check that the table has not been deleted from DB
         $this->assertTrue($dbman->table_exists('test_table1'));
@@ -1239,6 +1247,11 @@ class ddl_test extends UnitTestCase {
         }
 
         // Real but invalid xml file
+        $devhack = false;
+        if (!empty($CFG->xmldbdisablenextprevchecking)) {
+            $CFG->xmldbdisablenextprevchecking = false;
+            $devhack = true;
+        }
         try {
             ob_start(); // hide debug warning
             $dbman->install_from_xmldb_file($CFG->libdir.'/ddl/simpletest/fixtures/invalid.xml');
@@ -1248,6 +1261,9 @@ class ddl_test extends UnitTestCase {
             ob_end_clean();
             $this->assertTrue($e instanceof moodle_exception);
         }
+        if ($devhack) {
+            $CFG->xmldbdisablenextprevchecking = true;
+        }
 
         // Check that the table has not yet been created in DB
         $this->assertFalse($dbman->table_exists('test_table1'));