diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
index f46019ccb2..9801a83da8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
@@ -1941,7 +1941,6 @@ public class FailoverTest extends FailoverTestBase {
    public void testBackupServerNotRemoved() throws Exception {
       // HORNETQ-720 Disabling test for replicating backups.
       if (!(backupServer.getServer().getHAPolicy() instanceof SharedStoreSlavePolicy)) {
-         waitForComponent(backupServer, 1);
          return;
       }
       locator.setFailoverOnInitialConnection(true);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
index 6ff5d6bba8..bf7148fd4e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/ReplicatedLargeMessageWithDelayFailoverTest.java
@@ -34,7 +34,13 @@ public class ReplicatedLargeMessageWithDelayFailoverTest extends ReplicatedLarge
       startBackupServer = false;
       super.setUp();
       syncDelay = new BackupSyncDelay(backupServer, liveServer);
-      backupServer.start();
+
+      /* Using getName() here is a bit of a hack, but if the backup is started for this test then the test will fail
+       * intermittently due to an InterruptedException.
+       */
+      if (!getName().equals("testBackupServerNotRemoved")) {
+         backupServer.start();
+      }
    }
 
    @Override