diff --git a/build.gradle b/build.gradle
index 829dbdb0..9b1e706f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -551,7 +551,8 @@ testClusters.integTest {
 
         setting("plugins.security.authcz.admin_dn", "\n- CN=kirk,OU=client,O=client,L=test, C=de")
         setting('plugins.security.restapi.roles_enabled', '["all_access", "security_rest_api_access"]')
-        setting('plugins.security.system_indices.enabled', "true")
+        //setting('plugins.security.system_indices.enabled', "true")
+        /*
         setting('plugins.security.system_indices.indices', '[' +
                 '".plugins-ml-config", ' +
                 '".plugins-ml-connector", ' +
@@ -579,6 +580,8 @@ testClusters.integTest {
                 '".plugins-flow-framework-state"' +
                 ']'
         )
+
+        */
         setSecure(true)
     }
 
diff --git a/src/test/java/org/opensearch/integTest/ToolIntegrationTest.java b/src/test/java/org/opensearch/integTest/ToolIntegrationTest.java
index afdfb3d4..9ff3fdb0 100644
--- a/src/test/java/org/opensearch/integTest/ToolIntegrationTest.java
+++ b/src/test/java/org/opensearch/integTest/ToolIntegrationTest.java
@@ -64,7 +64,9 @@ public void stopMockLLM() {
 
     @After
     public void deleteModel() {
-        deleteModel(modelId);
+        if (modelId != null) {
+            deleteModel(modelId);
+        }
     }
 
     private String setUpConnectorWithRetry(int maxRetryTimes) throws InterruptedException {