diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb6bb6dacc..804913cc66 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -44,6 +44,8 @@
       <module name="corda-core_integrationTest" target="1.8" />
       <module name="corda-core_smokeTest" target="1.8" />
       <module name="corda-finance_integrationTest" target="1.8" />
+      <module name="corda-isolated_main" target="1.8" />
+      <module name="corda-isolated_test" target="1.8" />
       <module name="corda-project_buildSrc_main" target="1.8" />
       <module name="corda-project_buildSrc_test" target="1.8" />
       <module name="corda-project_canonicalizer_main" target="1.8" />
diff --git a/node/src/integration-test/kotlin/net/corda/node/flows/FlowRetryTest.kt b/node/src/integration-test/kotlin/net/corda/node/flows/FlowRetryTest.kt
index b1b0f0443f..2719379beb 100644
--- a/node/src/integration-test/kotlin/net/corda/node/flows/FlowRetryTest.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/flows/FlowRetryTest.kt
@@ -16,6 +16,7 @@ import net.corda.core.utilities.ProgressTracker
 import net.corda.core.utilities.getOrThrow
 import net.corda.core.utilities.unwrap
 import net.corda.node.services.Permissions
+import net.corda.node.services.statemachine.FlowTimeoutException
 import net.corda.testing.core.ALICE_NAME
 import net.corda.testing.core.BOB_NAME
 import net.corda.testing.core.singleIdentity
@@ -117,8 +118,6 @@ fun isQuasarAgentSpecified(): Boolean {
     return jvmArgs.any { it.startsWith("-javaagent:") && it.contains("quasar") }
 }
 
-class ExceptionToCauseRetry : SQLException("deadlock")
-
 class ExceptionToCauseFiniteRetry : ConstraintViolationException("Faked violation", SQLException("Fake"), "Fake name")
 
 @StartableByRPC
@@ -135,7 +134,7 @@ class InitiatorFlow(private val sessionsCount: Int, private val iterationsCount:
             val visited = Visited(sessionNum, iterationNum, step)
             if (visited !in seen) {
                 seen += visited
-                throw ExceptionToCauseRetry()
+                throw FlowTimeoutException()
             }
         }
     }
@@ -186,7 +185,7 @@ class InitiatedFlow(val session: FlowSession) : FlowLogic<Any>() {
             val visited = Visited(sessionNum, iterationNum, step)
             if (visited !in seen) {
                 seen += visited
-                throw ExceptionToCauseRetry()
+                throw FlowTimeoutException()
             }
         }
     }