diff --git a/src/test/kotlin/com/r3corda/core/testing/TradeDemoTest.kt b/src/test/kotlin/com/r3corda/core/testing/TradeDemoTest.kt
index ae75523736..bc29139cb4 100644
--- a/src/test/kotlin/com/r3corda/core/testing/TradeDemoTest.kt
+++ b/src/test/kotlin/com/r3corda/core/testing/TradeDemoTest.kt
@@ -4,6 +4,7 @@ import com.r3corda.demos.DemoConfig
 import com.r3corda.demos.runTraderDemo
 import org.junit.Test
 import java.nio.file.Paths
+import kotlin.concurrent.thread
 import kotlin.test.assertEquals
 
 class TraderDemoTest {
@@ -19,7 +20,14 @@ class TraderDemoTest {
 
 private fun runBuyer() {
     val config = DemoConfig(true)
-    runTraderDemo(arrayOf("--role", "BUYER"), config)
+    thread(true, false, null, "Buyer", -1, {
+        try {
+            runTraderDemo(arrayOf("--role", "BUYER"), config)
+        } finally {
+            // Will only reach here during error or after node is stopped, so ensure lock is unlocked.
+            config.nodeReady.countDown()
+        }
+    })
     config.nodeReady.await()
 }