diff --git a/src/org/labkey/test/tests/AdvancedImportOptionsTest.java b/src/org/labkey/test/tests/AdvancedImportOptionsTest.java
index 4cd9775b1a..3da5e53f96 100644
--- a/src/org/labkey/test/tests/AdvancedImportOptionsTest.java
+++ b/src/org/labkey/test/tests/AdvancedImportOptionsTest.java
@@ -72,6 +72,7 @@ public class AdvancedImportOptionsTest extends BaseWebDriverTest implements Post
     private static final int EXPECTED_COMPLETED_IMPORT_JOBS = 1;
     private static final int EXPECTED_COMPLETED_MULTI_FOLDER_JOBS = 2;
     private Boolean _studyDesignPreviouslyEnabled;
+    private Boolean _advancedImportOptionsEnabled;
 
     @Override
     public List<String> getAssociatedModules()
@@ -96,6 +97,7 @@ public static void doSetup()
     {
         AdvancedImportOptionsTest test = getCurrentTest();
         test._studyDesignPreviouslyEnabled = OptionalFeatureHelper.enableOptionalFeature(test.createDefaultConnection(), "studyDesignFlag");
+        test._advancedImportOptionsEnabled = OptionalFeatureHelper.enableOptionalFeature(test.createDefaultConnection(), "advancedImportFlag");
     }
 
     @Override
@@ -109,6 +111,9 @@ public void doCleanup(boolean afterTest) throws TestTimeoutException
         if (_studyDesignPreviouslyEnabled != null)
             OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "studyDesignFlag", _studyDesignPreviouslyEnabled);
 
+        if (_advancedImportOptionsEnabled != null)
+            OptionalFeatureHelper.setOptionalFeature(createDefaultConnection(), "advancedImportFlag", _advancedImportOptionsEnabled);
+
         _userHelper.deleteUser(LIMITED_USER);
     }