diff --git a/experimental/behave/build.gradle b/experimental/behave/build.gradle
index 1fe4320d42..2aabc64c1e 100644
--- a/experimental/behave/build.gradle
+++ b/experimental/behave/build.gradle
@@ -42,6 +42,8 @@ repositories {
 sourceSets {
     behave {
         kotlin {
+            compileClasspath += main.output
+            runtimeClasspath += main.output
             srcDirs = ['src/main/kotlin', 'src/scenario/kotlin']
         }
         resources.srcDir file('src/scenario/resources')
@@ -56,12 +58,6 @@ sourceSets {
             srcDirs = ['src/scenario/resources']
         }
     }
-    main {
-        kotlin {
-            compileClasspath += sourceSets.behave.output
-            runtimeClasspath += sourceSets.behave.output
-        }
-    }
 }
 
 configurations {
@@ -182,3 +178,5 @@ task apiJar(type: Jar, dependsOn: classes) {
 artifacts {
     testArtifacts apiJar
 }
+
+jar.finalizedBy (apiJar, behaveJar)
\ No newline at end of file
diff --git a/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/StepsBlock.kt b/experimental/behave/src/scenario/kotlin/net/corda/behave/scenarios/StepsBlock.kt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/testing/qa/behave/tools/rpc-proxy/src/smoke-test/kotlin/net/corda/behave/service/proxy/RPCProxyWebServiceTest.kt b/testing/qa/behave/tools/rpc-proxy/src/smoke-test/kotlin/net/corda/behave/service/proxy/RPCProxyWebServiceTest.kt
index 73063737ff..3db6ce890f 100644
--- a/testing/qa/behave/tools/rpc-proxy/src/smoke-test/kotlin/net/corda/behave/service/proxy/RPCProxyWebServiceTest.kt
+++ b/testing/qa/behave/tools/rpc-proxy/src/smoke-test/kotlin/net/corda/behave/service/proxy/RPCProxyWebServiceTest.kt
@@ -22,6 +22,7 @@ import org.junit.Ignore
 import org.junit.Test
 import java.net.URL
 
+@Ignore
 class RPCProxyWebServiceTest {
 
     /**
@@ -175,7 +176,6 @@ class RPCProxyWebServiceTest {
         assertVaultHoldsCash(responseA, responseB)
     }
 
-    @Ignore
     @Test
     fun startMultiABCPartyCashFlows() {
         val notary = rpcProxyClient.notaryIdentities()[0]
@@ -238,7 +238,6 @@ class RPCProxyWebServiceTest {
     }
 
     // enable Flow Draining on Node B
-    @Ignore
     @Test
     fun startMultiACPartyCashFlows() {
         val notary = rpcProxyClient.notaryIdentities()[0]