diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
index 0f2ff035b2..f48c6fa55d 100644
--- a/acceptance-tests/build.gradle
+++ b/acceptance-tests/build.gradle
@@ -13,50 +13,68 @@
 
 dependencies {
 
-  testRuntime 'org.apache.logging.log4j:log4j-core'
-  testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl'
+  testSupportImplementation 'org.apache.logging.log4j:log4j-core'
+  testSupportImplementation 'org.apache.logging.log4j:log4j-slf4j-impl'
+
+  testSupportImplementation project(':config')
+  testSupportImplementation project(':consensus:clique')
+  testSupportImplementation project(':consensus:ibft')
+  testSupportImplementation project(':crypto')
+  testSupportImplementation project(':enclave')
+  testSupportImplementation project(':ethereum:blockcreation')
+  testSupportImplementation project(':ethereum:core')
+  testSupportImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
+  testSupportImplementation project(':ethereum:eth')
+  testSupportImplementation project(':ethereum:graphql')
+  testSupportImplementation project(':ethereum:jsonrpc')
+  testSupportImplementation project(':ethereum:p2p')
+  testSupportImplementation project(':ethereum:permissioning')
+  testSupportImplementation project(':ethereum:rlp')
+  testSupportImplementation project(':metrics:core')
+  testSupportImplementation project(':pantheon')
+  testSupportImplementation project(':plugin-api')
+  testSupportImplementation project(':services:kvstore')
+  testSupportImplementation project(':testutil')
+  testSupportImplementation project(':util')
+
+  testSupportImplementation 'com.github.tomakehurst:wiremock-jre8'
+  testSupportImplementation 'com.google.guava:guava'
+  testSupportImplementation 'com.squareup.okhttp3:okhttp'
+  testSupportImplementation 'info.picocli:picocli'
+  testSupportImplementation 'io.reactivex.rxjava2:rxjava'
+  testSupportImplementation 'io.vertx:vertx-core'
+  testSupportImplementation 'junit:junit'
+  testSupportImplementation 'net.consensys:orion'
+  testSupportImplementation 'org.apache.logging.log4j:log4j-api'
+  testSupportImplementation 'org.assertj:assertj-core'
+  testSupportImplementation 'org.awaitility:awaitility'
+  testSupportImplementation 'org.java-websocket:Java-WebSocket'
+  testSupportImplementation 'org.web3j:abi'
+  testSupportImplementation 'org.web3j:pantheon'
+  testSupportImplementation 'org.web3j:crypto'
+  testSupportImplementation 'tech.pegasys.ethsigner.internal:core'
+  testSupportImplementation 'tech.pegasys.ethsigner.internal:file-based'
+  testSupportImplementation 'tech.pegasys.ethsigner.internal:signing-api'
 
-  testImplementation project(':config')
-  testImplementation project(':consensus:clique')
-  testImplementation project(':consensus:ibft')
-  testImplementation project(':crypto')
-  testImplementation project(':enclave')
-  testImplementation project(':ethereum:blockcreation')
-  testImplementation project(':ethereum:core')
-  testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
-  testImplementation project(':ethereum:eth')
-  testImplementation project(':ethereum:graphql')
-  testImplementation project(':ethereum:jsonrpc')
-  testImplementation project(':ethereum:p2p')
-  testImplementation project(':ethereum:permissioning')
-  testImplementation project(':ethereum:rlp')
-  testImplementation project(':metrics:core')
-  testImplementation project(':pantheon')
-  testImplementation project(path: ':pantheon', configuration: 'testArtifacts')
-  testImplementation project(':plugins:rocksdb')
-  testImplementation project(':plugin-api')
-  testImplementation project(':services:kvstore')
-  testImplementation project(':testutil')
-  testImplementation project(':util')
 
-  testImplementation 'com.github.tomakehurst:wiremock-jre8'
-  testImplementation 'com.google.guava:guava'
-  testImplementation 'com.squareup.okhttp3:okhttp'
-  testImplementation 'info.picocli:picocli'
-  testImplementation 'io.reactivex.rxjava2:rxjava'
-  testImplementation 'io.vertx:vertx-core'
   testImplementation 'junit:junit'
   testImplementation 'net.consensys:orion'
-  testImplementation 'org.apache.logging.log4j:log4j-api'
   testImplementation 'org.assertj:assertj-core'
-  testImplementation 'org.awaitility:awaitility'
-  testImplementation 'org.java-websocket:Java-WebSocket'
   testImplementation 'org.web3j:abi'
   testImplementation 'org.web3j:pantheon'
-  testImplementation 'org.web3j:crypto'
+  testImplementation project(':ethereum:jsonrpc')
+  testImplementation project(':enclave')
+  testImplementation 'org.awaitility:awaitility'
+  testImplementation project(':consensus:clique')
+  testImplementation project(':ethereum:permissioning')
+  testImplementation project(':util')
+  testImplementation project(':plugin-api')
+  testImplementation project(':pantheon')
+  testImplementation project(':ethereum:core')
+  testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
+  testImplementation project(':testutil')
   testImplementation 'tech.pegasys.ethsigner.internal:core'
   testImplementation 'tech.pegasys.ethsigner.internal:file-based'
-  testImplementation 'tech.pegasys.ethsigner.internal:signing-api'
 }
 
 test.enabled = false
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/AcceptanceTestBase.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/BlockUtils.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/BlockUtils.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/BlockUtils.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/BlockUtils.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/StaticNodesUtils.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/StaticNodesUtils.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/StaticNodesUtils.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/StaticNodesUtils.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/WaitUtils.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/WaitUtils.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/WaitUtils.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/WaitUtils.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Account.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Account.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Account.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Account.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Accounts.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Accounts.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Accounts.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/account/Accounts.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Amount.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Amount.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Amount.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Amount.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Blockchain.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Blockchain.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Blockchain.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/blockchain/Blockchain.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/Condition.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/Condition.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/Condition.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/Condition.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalance.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/account/ExpectAccountBalanceNotChanging.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/AdminConditions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/AdminConditions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/AdminConditions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/AdminConditions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/admin/ExpectPeerAdded.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBeneficiary.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNotCreated.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectBlockNumberAbove.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/blockchain/ExpectMinimumBlockNumber.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/AwaitSignerSetChange.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/CliqueConditions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/CliqueConditions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/CliqueConditions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/CliqueConditions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectNonceVote.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectProposals.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectProposals.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectProposals.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectProposals.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidators.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidators.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidators.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidators.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlock.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectValidatorsAtBlockHash.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/clique/ExpectedBlockHasProposer.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/EthConditions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/EthConditions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/EthConditions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/EthConditions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthAccountsException.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetTransactionReceiptIsAbsent.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthGetWorkException.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectEthSendRawTransactionException.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceipt.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithReason.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/ExpectSuccessfulEthGetTransactionReceiptWithoutReason.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/eth/SanityCheckEthGetWorkValues.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/AwaitValidatorSetChange.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectProposals.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/ExpectValidators.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/ibft2/Ibft2Conditions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/AwaitLoginResponse.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginSuccess.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/ExpectLoginUnauthorized.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/LoginConditions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/LoginConditions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/LoginConditions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/login/LoginConditions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/miner/MiningStatusCondition.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCount.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/AwaitNetPeerCountException.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsOnlyJsonRpcActive.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionException.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionConnectionExceptionWithCause.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionIsNotBlank.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionException.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/ExpectNetVersionPermissionJsonRpcUnauthorizedResponse.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/NetConditions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/NetConditions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/NetConditions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/net/NetConditions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AccountSmartContractPermissioningConditions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddAccountsToWhitelistSuccessfully.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/AddNodeSuccess.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetExpectedAccountsWhitelist.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/GetNodesWhitelistPopulated.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/NodeSmartContractPermissioningConditions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/PermissioningConditions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/PermissioningConditions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/PermissioningConditions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/PermissioningConditions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveAccountsFromWhitelistSuccessfully.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/RemoveNodeSuccess.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForFalseResponse.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WaitForTrueResponse.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/perm/WhiteListContainsKeyAndValue.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/ExpectWeb3Sha3Equals.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/Web3Conditions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/Web3Conditions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/Web3Conditions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/condition/web3/Web3Conditions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ContractVerifier.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ContractVerifier.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ContractVerifier.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ContractVerifier.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/contract/ExpectValidTransactionReceipt.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClient.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClient.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClient.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClient.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/EthSignerClientTest.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/PrivateTransactionRequest.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerConfig.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarness.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/ethsigner/testutil/EthSignerTestHarnessFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Node.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Node.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Node.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/Node.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNode.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeRunner.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeRunner.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeRunner.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/PantheonNodeRunner.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ProcessPantheonNodeRunner.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/RunnableNode.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/RunnableNode.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/RunnableNode.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/RunnableNode.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/ThreadPantheonNodeRunner.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/Cluster.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/Cluster.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/Cluster.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/Cluster.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfiguration.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/cluster/ClusterConfigurationBuilder.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfiguration.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfiguration.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfiguration.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfiguration.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/NodeConfigurationFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfiguration.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfiguration.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfiguration.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfiguration.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfigurationBuilder.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfigurationBuilder.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfigurationBuilder.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeConfigurationBuilder.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/PantheonNodeFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/genesis/GenesisConfigurationProvider.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/permissioning/PermissionedNodeBuilder.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeConfiguration.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/configuration/privacy/PrivacyNodeFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyAcceptanceTestBase.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyCluster.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyCluster.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyCluster.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyCluster.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyNode.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyNode.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyNode.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/PrivacyNode.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccount.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccount.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccount.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccount.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/account/PrivacyAccountResolver.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/EeaGetTransactionReceiptTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectInternalErrorPrivateTransactionReceipt.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectInternalErrorPrivateTransactionReceipt.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectInternalErrorPrivateTransactionReceipt.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectInternalErrorPrivateTransactionReceipt.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectNoPrivateTransactionReceipt.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectNoPrivateTransactionReceipt.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectNoPrivateTransactionReceipt.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectNoPrivateTransactionReceipt.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectValidPrivacyGroupCreated.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectValidPrivacyGroupCreated.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectValidPrivacyGroupCreated.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectValidPrivacyGroupCreated.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateContractDeployedReceipt.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateContractDeployedReceipt.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateContractDeployedReceipt.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateContractDeployedReceipt.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/ExpectValidPrivateTransactionReceipt.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateCondition.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateCondition.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateCondition.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateCondition.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateContractCondition.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateContractCondition.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateContractCondition.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateContractCondition.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateContractVerifier.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateContractVerifier.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateContractVerifier.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateContractVerifier.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/condition/PrivateTransactionVerifier.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/CallPrivateSmartContractFunction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/DeployPrivateSmartContractWithPrivacyGroupIdTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/LoadPrivateSmartContractTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/contract/PrivateContractTransactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/CreatePrivacyGroupTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/FindPrivacyGroupTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/GetAllPrivacyMarkerTransactionHashes.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/privacy/transaction/PrivacyTransactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/JsonRpcSuccessEvent.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/Subscription.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/Subscription.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/Subscription.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/Subscription.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/SubscriptionEvent.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/SubscriptionEvent.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/SubscriptionEvent.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/SubscriptionEvent.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocket.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocket.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocket.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocket.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketConnection.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketEvent.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketEvent.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketEvent.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/pubsub/WebSocketEvent.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/CallSmartContractFunction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/CallSmartContractFunction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/CallSmartContractFunction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/CallSmartContractFunction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/DeploySmartContractTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/NodeRequests.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/NodeRequests.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/NodeRequests.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/NodeRequests.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/Transaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/Transaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/Transaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/Transaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/AccountTransactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/AccountTransactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/AccountTransactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/AccountTransactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionBuilder.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/account/TransferTransactionSet.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AddPeerTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminRequestFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminTransactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminTransactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminTransactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/admin/AdminTransactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueDiscard.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSigners.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueGetSignersAtHash.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueProposals.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueProposals.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueProposals.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueProposals.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliquePropose.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliquePropose.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliquePropose.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliquePropose.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueRequestFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/clique/CliqueTransactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/contract/ContractTransactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/contract/ContractTransactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/contract/ContractTransactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/contract/ContractTransactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthAccountsTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthBlockNumberTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBalanceTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetBlockTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionCountTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetTransactionReceiptWithRevertReason.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthGetWorkTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthMiningTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthSendRawTransactionTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthTransactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthTransactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthTransactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/eth/EthTransactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Discard.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidators.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2GetValidatorsAtHash.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Proposals.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Propose.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2RequestFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/ibft2/Ibft2Transactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginRequestFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginSuccessfulTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/login/LoginUnauthorizedTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerRequestFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStartTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerStopTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerTransactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerTransactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerTransactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/miner/MinerTransactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/CustomRequestFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetPeerCountTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetServicesTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetTransactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetTransactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetTransactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetTransactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/net/NetVersionTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningAllowAccountTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningForbidAccountTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningIsAllowedTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/AccountSmartContractPermissioningTransactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningAllowNodeTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningConnectionIsAllowedTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningForbidNodeTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningIsAllowedTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/NodeSmartContractPermissioningTransactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddAccountsToWhitelistTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermAddNodeTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetAccountsWhitelistTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermGetNodesWhitelistTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveAccountsFromWhitelistTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermRemoveNodeTransaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningJsonRpcRequestFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/perm/PermissioningTransactions.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/privacy/PrivacyRequestFactory.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Sha3Transaction.java
diff --git a/acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Transactions.java b/acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Transactions.java
similarity index 100%
rename from acceptance-tests/src/test/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Transactions.java
rename to acceptance-tests/src/test-support/java/tech/pegasys/pantheon/tests/acceptance/dsl/transaction/web3/Web3Transactions.java
diff --git a/build.gradle b/build.gradle
index d433319858..ae356f73aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -278,7 +278,39 @@ check.dependsOn('checkPluginAPIChanges')
 
 subprojects {
 
-  if (file('src/main/java').directory) {
+  sourceSets {
+    // test-support can be consumed as a library by other projects in their tests
+    testSupport {
+      java {
+        compileClasspath += main.output
+        runtimeClasspath += main.output
+        srcDir file('src/test-support/java')
+      }
+      resources.srcDir file('src/test-support/resources')
+    }
+    integrationTest {
+      java {
+        compileClasspath += main.output
+        runtimeClasspath += main.output
+        srcDir file('src/integration-test/java')
+      }
+      resources.srcDir file('src/integration-test/resources')
+    }
+  }
+
+  task testSupportJar(type: Jar) {
+    baseName = "${project.name}-support-test"
+    classifier = 'test-support'
+    from sourceSets.testSupport.output
+  }
+
+  def sourceSetIsPopulated = { sourceSetName ->
+    def result = project.sourceSets.names.contains(sourceSetName) && !project.sourceSets.getAt(sourceSetName).allSource.empty
+    logger.info("Project = "+ project.name + " Has Source Set (" + sourceSetName + ") = " + result + "(" + project.sourceSets.names + ")")
+    return result
+  }
+
+  if(sourceSetIsPopulated("main") || sourceSetIsPopulated("testSupport")) {
     apply plugin: 'com.jfrog.bintray'
     apply plugin: 'maven-publish'
 
@@ -287,9 +319,15 @@ subprojects {
         mavenJava(MavenPublication) {
           groupId "tech.pegasys.pantheon.internal"
           version "${project.version}"
-          from components.java
-          artifact sourcesJar
-          artifact javadocJar
+          if(sourceSetIsPopulated("main")) {
+            from components.java
+            artifact sourcesJar
+            artifact javadocJar
+          }
+
+          if(sourceSetIsPopulated("testSupport")) {
+            artifact testSupportJar
+          }
           versionMapping {
             usage('java-api') { fromResolutionOf('runtimeClasspath') }
             usage('java-runtime') { fromResolutionResult() }
@@ -336,25 +374,6 @@ subprojects {
     options.incremental = true
   }
 
-  sourceSets {
-    // test-support can be consumed as a library by other projects in their tests
-    testSupport {
-      java {
-        compileClasspath += main.output
-        runtimeClasspath += main.output
-        srcDir file('src/test-support/java')
-      }
-      resources.srcDir file('src/test-support/resources')
-    }
-    integrationTest {
-      java {
-        compileClasspath += main.output
-        runtimeClasspath += main.output
-        srcDir file('src/integration-test/java')
-      }
-      resources.srcDir file('src/integration-test/resources')
-    }
-  }
 
   configurations {
     testSupportImplementation.extendsFrom implementation
@@ -362,10 +381,6 @@ subprojects {
     testSupportArtifacts
   }
 
-  task testSupportJar(type: Jar) {
-    baseName = "${project.name}-support-test"
-    from sourceSets.testSupport.output
-  }
 
   dependencies {
     testImplementation sourceSets.testSupport.output