diff --git a/node/src/integration-test/kotlin/net/corda/contracts/djvm/attachment/SandboxAttachmentContract.kt b/node/src/integration-test/kotlin/net/corda/contracts/djvm/attachment/SandboxAttachmentContract.kt
index 4d3037cd86..d669f1f9ce 100644
--- a/node/src/integration-test/kotlin/net/corda/contracts/djvm/attachment/SandboxAttachmentContract.kt
+++ b/node/src/integration-test/kotlin/net/corda/contracts/djvm/attachment/SandboxAttachmentContract.kt
@@ -12,12 +12,12 @@ class SandboxAttachmentContract : Contract {
         val attachments = tx.attachments
         require(attachments.isNotEmpty()) { "Attachments are missing for TX=${tx.id}" }
 
-        require(attachments.size == 1) { "Did not expect to find ${attachments.size} attachments for TX${tx.id}" }
+        require(attachments.size == 1) { "Did not expect to find ${attachments.size} attachments for TX=${tx.id}" }
         val attachment = attachments[0]
         require(attachment.size > 0) { "Attachment ${attachment.id} has no contents for TX=${tx.id}" }
 
         val keyCount = attachment.signerKeys.size
-        require(keyCount == 1) { "Attachment ${attachment.id} has $keyCount signing keys for TX=${tx.id}" }
+        require(keyCount == 1) { "Did not expect to find $keyCount signing keys for attachment ${attachment.id}, TX=${tx.id}" }
 
         tx.commandsOfType(ExtractFile::class.java).forEach { extract ->
             val fileName = extract.value.fileName
diff --git a/node/src/integration-test/kotlin/net/corda/node/services/DeterministicContractCryptoTest.kt b/node/src/integration-test/kotlin/net/corda/node/services/DeterministicContractCryptoTest.kt
index 108b3271fc..31cf845e17 100644
--- a/node/src/integration-test/kotlin/net/corda/node/services/DeterministicContractCryptoTest.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/services/DeterministicContractCryptoTest.kt
@@ -15,7 +15,8 @@ import net.corda.testing.driver.DriverParameters
 import net.corda.testing.driver.driver
 import net.corda.testing.driver.internal.incrementalPortAllocation
 import net.corda.testing.node.NotarySpec
-import net.corda.testing.node.internal.cordappsForPackages
+import net.corda.testing.node.internal.CustomCordapp
+import net.corda.testing.node.internal.cordappWithPackages
 import org.junit.ClassRule
 import org.junit.Test
 import org.junit.jupiter.api.assertDoesNotThrow
@@ -35,9 +36,13 @@ class DeterministicContractCryptoTest {
                 portAllocation = incrementalPortAllocation(),
                 startNodesInProcess = false,
                 notarySpecs = listOf(NotarySpec(DUMMY_NOTARY_NAME, validating = true)),
-                cordappsForAllNodes = cordappsForPackages(
-                    "net.corda.contracts.djvm.crypto",
-                    "net.corda.flows.djvm.crypto"
+                cordappsForAllNodes = listOf(
+                    cordappWithPackages("net.corda.flows.djvm.crypto"),
+                    CustomCordapp(
+                        packages = setOf("net.corda.contracts.djvm.crypto"),
+                        name = "deterministic-crypto-contract",
+                        signingInfo = CustomCordapp.SigningInfo()
+                    )
                 ),
                 djvmBootstrapSource = djvmSources.bootstrap,
                 djvmCordaSource = djvmSources.corda
diff --git a/node/src/integration-test/kotlin/net/corda/node/services/NonDeterministicContractVerifyTest.kt b/node/src/integration-test/kotlin/net/corda/node/services/NonDeterministicContractVerifyTest.kt
index 825d7eddac..5f13d5aa12 100644
--- a/node/src/integration-test/kotlin/net/corda/node/services/NonDeterministicContractVerifyTest.kt
+++ b/node/src/integration-test/kotlin/net/corda/node/services/NonDeterministicContractVerifyTest.kt
@@ -13,7 +13,8 @@ import net.corda.testing.driver.DriverParameters
 import net.corda.testing.driver.driver
 import net.corda.testing.driver.internal.incrementalPortAllocation
 import net.corda.testing.node.NotarySpec
-import net.corda.testing.node.internal.cordappsForPackages
+import net.corda.testing.node.internal.CustomCordapp
+import net.corda.testing.node.internal.cordappWithPackages
 import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat
 import org.junit.ClassRule
 import org.junit.Test
@@ -33,9 +34,13 @@ class NonDeterministicContractVerifyTest {
                 portAllocation = incrementalPortAllocation(),
                 startNodesInProcess =false,
                 notarySpecs = listOf(NotarySpec(DUMMY_NOTARY_NAME, validating = true)),
-                cordappsForAllNodes = cordappsForPackages(
-                    "net.corda.contracts.djvm.broken",
-                    "net.corda.flows.djvm.broken"
+                cordappsForAllNodes = listOf(
+                    cordappWithPackages("net.corda.flows.djvm.broken"),
+                    CustomCordapp(
+                        packages = setOf("net.corda.contracts.djvm.broken"),
+                        name = "nondeterministic-contract",
+                        signingInfo = CustomCordapp.SigningInfo()
+                    )
                 ),
                 djvmBootstrapSource = djvmSources.bootstrap,
                 djvmCordaSource = djvmSources.corda