diff --git a/tools/jmeter/src/main/resources/Testplans/NightlyBenchmark.jmx b/tools/jmeter/src/main/resources/Testplans/NightlyBenchmark.jmx
index ad6d7a8173..05c5c28726 100644
--- a/tools/jmeter/src/main/resources/Testplans/NightlyBenchmark.jmx
+++ b/tools/jmeter/src/main/resources/Testplans/NightlyBenchmark.jmx
@@ -58,6 +58,11 @@
5
=
+
+ firewallHost
+ performance-node-3
+ =
+
@@ -1079,6 +1084,420 @@
+
+ continue
+
+ false
+ -1
+
+ 1
+
+ 1509455820000
+ 1509455820000
+ true
+ ${duration}
+ ${pause}
+
+
+
+
+
+
+ label
+ ${__samplerName}-${__groovy(ctx.getThreadGroup().getNumThreads() * vars.get("remoteAgentCount").toInteger())}
+ =
+
+
+ host
+ ${firewallHost}
+ =
+
+
+ port
+ ${port}
+ =
+
+
+ username
+ ${username}
+ =
+
+
+ password
+ ${password}
+ =
+
+
+ notaryName
+ ${notaryName}
+ =
+
+
+ otherPartyName
+ ${otherPartyName}
+ =
+
+
+ numberOfStatesPerTx
+ 1
+ =
+
+
+ anonymousIdentities
+ false
+ =
+
+
+
+ com.r3.corda.jmeter.CashPaySampler
+
+
+
+
+ continue
+
+ false
+ -1
+
+ 5
+
+ 1509455820000
+ 1509455820000
+ true
+ ${duration}
+ ${pause}
+
+
+
+
+
+
+ label
+ ${__samplerName}-${__groovy(ctx.getThreadGroup().getNumThreads() * vars.get("remoteAgentCount").toInteger())}
+ =
+
+
+ host
+ ${firewallHost}
+ =
+
+
+ port
+ ${port}
+ =
+
+
+ username
+ ${username}
+ =
+
+
+ password
+ ${password}
+ =
+
+
+ notaryName
+ ${notaryName}
+ =
+
+
+ otherPartyName
+ ${otherPartyName}
+ =
+
+
+ numberOfStatesPerTx
+ 1
+ =
+
+
+ anonymousIdentities
+ false
+ =
+
+
+
+ com.r3.corda.jmeter.CashPaySampler
+
+
+
+
+ continue
+
+ false
+ -1
+
+ 10
+
+ 1509455820000
+ 1509455820000
+ true
+ ${duration}
+ ${pause}
+
+
+
+
+
+
+ label
+ ${__samplerName}-${__groovy(ctx.getThreadGroup().getNumThreads() * vars.get("remoteAgentCount").toInteger())}
+ =
+
+
+ host
+ ${firewallHost}
+ =
+
+
+ port
+ ${port}
+ =
+
+
+ username
+ ${username}
+ =
+
+
+ password
+ ${password}
+ =
+
+
+ notaryName
+ ${notaryName}
+ =
+
+
+ otherPartyName
+ ${otherPartyName}
+ =
+
+
+ numberOfStatesPerTx
+ 1
+ =
+
+
+ anonymousIdentities
+ false
+ =
+
+
+
+ com.r3.corda.jmeter.CashPaySampler
+
+
+
+
+ continue
+
+ false
+ -1
+
+ 20
+
+ 1509455820000
+ 1509455820000
+ true
+ ${duration}
+ ${pause}
+
+
+
+
+
+
+ label
+ ${__samplerName}-${__groovy(ctx.getThreadGroup().getNumThreads() * vars.get("remoteAgentCount").toInteger())}
+ =
+
+
+ host
+ ${firewallHost}
+ =
+
+
+ port
+ ${port}
+ =
+
+
+ username
+ ${username}
+ =
+
+
+ password
+ ${password}
+ =
+
+
+ notaryName
+ ${notaryName}
+ =
+
+
+ otherPartyName
+ ${otherPartyName}
+ =
+
+
+ numberOfStatesPerTx
+ 1
+ =
+
+
+ anonymousIdentities
+ false
+ =
+
+
+
+ com.r3.corda.jmeter.CashPaySampler
+
+
+
+
+ continue
+
+ false
+ -1
+
+ 30
+
+ 1509455820000
+ 1509455820000
+ true
+ ${duration}
+ ${pause}
+
+
+
+
+
+
+ label
+ ${__samplerName}-${__groovy(ctx.getThreadGroup().getNumThreads() * vars.get("remoteAgentCount").toInteger())}
+ =
+
+
+ host
+ ${firewallHost}
+ =
+
+
+ port
+ ${port}
+ =
+
+
+ username
+ ${username}
+ =
+
+
+ password
+ ${password}
+ =
+
+
+ notaryName
+ ${notaryName}
+ =
+
+
+ otherPartyName
+ ${otherPartyName}
+ =
+
+
+ numberOfStatesPerTx
+ 1
+ =
+
+
+ anonymousIdentities
+ false
+ =
+
+
+
+ com.r3.corda.jmeter.CashPaySampler
+
+
+
+
+ continue
+
+ false
+ -1
+
+ 40
+
+ 1509455820000
+ 1509455820000
+ true
+ ${duration}
+ ${pause}
+
+
+
+
+
+
+ label
+ ${__samplerName}-${__groovy(ctx.getThreadGroup().getNumThreads() * vars.get("remoteAgentCount").toInteger())}
+ =
+
+
+ host
+ ${firewallHost}
+ =
+
+
+ port
+ ${port}
+ =
+
+
+ username
+ ${username}
+ =
+
+
+ password
+ ${password}
+ =
+
+
+ notaryName
+ ${notaryName}
+ =
+
+
+ otherPartyName
+ ${otherPartyName}
+ =
+
+
+ numberOfStatesPerTx
+ 1
+ =
+
+
+ anonymousIdentities
+ false
+ =
+
+
+
+ com.r3.corda.jmeter.CashPaySampler
+
+
+
false