diff --git a/x-pack/plugin/ccr/build.gradle b/x-pack/plugin/ccr/build.gradle
index b8ed9f55932cc..e1ddb2f12d78b 100644
--- a/x-pack/plugin/ccr/build.gradle
+++ b/x-pack/plugin/ccr/build.gradle
@@ -18,6 +18,9 @@ integTest.enabled = false
 compileJava.options.compilerArgs << "-Xlint:-try"
 compileTestJava.options.compilerArgs << "-Xlint:-try"
 
+// Integration Test classes that cannot run with the security manager
+String[] noSecurityManagerITClasses = [ "**/CloseFollowerIndexIT.class" ]
+
 // Instead we create a separate task to run the
 // tests based on ESIntegTestCase
 task internalClusterTest(type: RandomizedTestingTask,
@@ -25,11 +28,22 @@ task internalClusterTest(type: RandomizedTestingTask,
         description: 'Java fantasy integration tests',
         dependsOn: unitTest.dependsOn) {
     include '**/*IT.class'
+    exclude noSecurityManagerITClasses
     systemProperty 'es.set.netty.runtime.available.processors', 'false'
 }
 check.dependsOn internalClusterTest
 internalClusterTest.mustRunAfter test
 
+task internalClusterTestNoSecurityManager(type: RandomizedTestingTask,
+        group: JavaBasePlugin.VERIFICATION_GROUP,
+        description: 'Java fantasy integration tests with no security manager',
+        dependsOn: unitTest.dependsOn) {
+    include noSecurityManagerITClasses
+    systemProperty 'es.set.netty.runtime.available.processors', 'false'
+    systemProperty 'tests.security.manager', 'false'
+}
+internalClusterTest.dependsOn internalClusterTestNoSecurityManager
+
 // add all sub-projects of the qa sub-project
 gradle.projectsEvaluated {
     project.subprojects
diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CloseFollowerIndexIT.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CloseFollowerIndexIT.java
index bd9f1a13bdb4d..2f111727b08ee 100644
--- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CloseFollowerIndexIT.java
+++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CloseFollowerIndexIT.java
@@ -11,17 +11,21 @@
 import org.elasticsearch.action.support.ActiveShardCount;
 import org.elasticsearch.action.support.master.AcknowledgedResponse;
 import org.elasticsearch.cluster.ClusterState;
-import org.elasticsearch.cluster.block.ClusterBlock;
+import org.elasticsearch.cluster.health.ClusterHealthStatus;
+import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.cluster.metadata.MetaDataIndexStateService;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.IndexSettings;
+import org.elasticsearch.index.engine.ReadOnlyEngine;
 import org.elasticsearch.xpack.CcrIntegTestCase;
 import org.elasticsearch.xpack.core.ccr.action.PutFollowAction;
+import org.junit.After;
+import org.junit.Before;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static java.util.Collections.singletonMap;
@@ -31,7 +35,36 @@
 
 public class CloseFollowerIndexIT extends CcrIntegTestCase {
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/pull/38767")
+    private Thread.UncaughtExceptionHandler uncaughtExceptionHandler;
+
+    @Before
+    public void wrapUncaughtExceptionHandler() {
+        uncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
+        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+            Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
+                if (t.getThreadGroup().getName().contains(getTestClass().getSimpleName())) {
+                    for (StackTraceElement element : e.getStackTrace()) {
+                        if (element.getClassName().equals(ReadOnlyEngine.class.getName())) {
+                            if (element.getMethodName().equals("assertMaxSeqNoEqualsToGlobalCheckpoint")) {
+                                return;
+                            }
+                        }
+                    }
+                }
+                uncaughtExceptionHandler.uncaughtException(t, e);
+            });
+            return null;
+        });
+    }
+
+    @After
+    public void restoreUncaughtExceptionHandler() {
+        AccessController.doPrivileged((PrivilegedAction<Void>) () -> {
+            Thread.setDefaultUncaughtExceptionHandler(uncaughtExceptionHandler);
+            return null;
+        });
+    }
+
     public void testCloseAndReopenFollowerIndex() throws Exception {
         final String leaderIndexSettings = getIndexSettings(1, 1, singletonMap(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), "true"));
         assertAcked(leaderClient().admin().indices().prepareCreate("index1").setSource(leaderIndexSettings, XContentType.JSON));
@@ -67,16 +100,22 @@ public void testCloseAndReopenFollowerIndex() throws Exception {
         assertThat(response.isAcknowledged(), is(true));
 
         ClusterState clusterState = followerClient().admin().cluster().prepareState().get().getState();
-        List<ClusterBlock> blocks = new ArrayList<>(clusterState.getBlocks().indices().get("index2"));
-        assertThat(blocks.size(), equalTo(1));
-        assertThat(blocks.get(0).id(), equalTo(MetaDataIndexStateService.INDEX_CLOSED_BLOCK_ID));
+        assertThat(clusterState.metaData().index("index2").getState(), is(IndexMetaData.State.CLOSE));
+        assertThat(clusterState.getBlocks().hasIndexBlock("index2", MetaDataIndexStateService.INDEX_CLOSED_BLOCK), is(true));
+        assertThat(followerClient().admin().cluster().prepareHealth("index2").get().getStatus(), equalTo(ClusterHealthStatus.RED));
 
         isRunning.set(false);
         for (Thread thread : threads) {
             thread.join();
         }
+
         assertAcked(followerClient().admin().indices().open(new OpenIndexRequest("index2")).get());
 
+        clusterState = followerClient().admin().cluster().prepareState().get().getState();
+        assertThat(clusterState.metaData().index("index2").getState(), is(IndexMetaData.State.OPEN));
+        assertThat(clusterState.getBlocks().hasIndexBlockWithId("index2", MetaDataIndexStateService.INDEX_CLOSED_BLOCK_ID), is(false));
+        ensureFollowerGreen("index2");
+
         refresh(leaderClient(), "index1");
         SearchRequest leaderSearchRequest = new SearchRequest("index1");
         leaderSearchRequest.source().trackTotalHits(true);