diff --git a/integration/310_container_to_container_edge_test.sh b/integration/310_container_to_container_edge_test.sh
index 1202e5c10..3922c7309 100755
--- a/integration/310_container_to_container_edge_test.sh
+++ b/integration/310_container_to_container_edge_test.sh
@@ -4,7 +4,7 @@
 
 start_suite "Test short lived connections between containers"
 
-WEAVE_NO_FASTDP=true WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch
+weave_on $HOST1 launch
 scope_on $HOST1 launch
 weave_on $HOST1 run -d --name nginx nginx
 weave_on $HOST1 run -d --name client alpine /bin/sh -c "while true; do \
diff --git a/integration/320_container_edge_cross_host_2_test.sh b/integration/320_container_edge_cross_host_2_test.sh
index 314cd7c00..26d6a3c02 100755
--- a/integration/320_container_edge_cross_host_2_test.sh
+++ b/integration/320_container_edge_cross_host_2_test.sh
@@ -4,8 +4,8 @@
 
 start_suite "Test short lived connections between containers on different hosts"
 
-WEAVE_NO_FASTDP=true WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch $HOST1 $HOST2
-WEAVE_NO_FASTDP=true WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST2 launch $HOST1 $HOST2
+weave_on $HOST1 launch $HOST1 $HOST2
+weave_on $HOST2 launch $HOST1 $HOST2
 
 scope_on $HOST1 launch
 scope_on $HOST2 launch
diff --git a/integration/330_application_edge_test.sh b/integration/330_application_edge_test.sh
index 66a215968..56363b041 100755
--- a/integration/330_application_edge_test.sh
+++ b/integration/330_application_edge_test.sh
@@ -2,10 +2,10 @@
 
 . ./config.sh
 
-start_suite "Test short connections between processes"
+start_suite "Test long connections (procspy) between processes"
 
-WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch
-scope_on $HOST1 launch
+weave_on $HOST1 launch
+scope_on $HOST1 launch --probe.conntrack=false
 weave_on $HOST1 run -d --name nginx nginx
 weave_on $HOST1 run -dti --name client alpine /bin/sh -c "while true; do \
 	nc nginx.weave.local 80 || true; \
diff --git a/integration/340_application_edge_across_host_2_test.sh b/integration/340_application_edge_across_host_2_test.sh
index 115865a65..e3b43e07b 100755
--- a/integration/340_application_edge_across_host_2_test.sh
+++ b/integration/340_application_edge_across_host_2_test.sh
@@ -2,13 +2,13 @@
 
 . ./config.sh
 
-start_suite "Test connections between processes on different hosts"
+start_suite "Test long connections (procspy) between processes on different hosts"
 
-WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch $HOST1 $HOST2
-WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST2 launch $HOST1 $HOST2
+weave_on $HOST1 launch $HOST1 $HOST2
+weave_on $HOST2 launch $HOST1 $HOST2
 
-scope_on $HOST1 launch
-scope_on $HOST2 launch
+scope_on $HOST1 launch --probe.conntrack=false
+scope_on $HOST2 launch --probe.conntrack=false
 
 weave_on $HOST1 run -d --name nginx nginx
 weave_on $HOST2 run -dti --name client alpine /bin/sh -c "while true; do \
diff --git a/integration/config.sh b/integration/config.sh
index 53717a09f..9d8b4dd45 100644
--- a/integration/config.sh
+++ b/integration/config.sh
@@ -38,7 +38,7 @@ scope_end_suite() {
 
 # this checks we have a named node in the given view
 has() {
-    local view=$1
+	local view=$1
 	local host=$2
 	local name=$3
 	local count=${4:-1}
@@ -63,7 +63,7 @@ container_id() {
 
 # this checks we have an edge from container 1 to container 2
 has_connection() {
-    local view="$1"
+	local view="$1"
 	local host="$2"
 	local from="$3"
 	local to="$4"
@@ -87,7 +87,7 @@ has_connection() {
 }
 
 wait_for() {
-    local view="$1"
+	local view="$1"
 	local host="$2"
 	local timeout="$3"
 	shift 2
@@ -115,5 +115,5 @@ wait_for() {
 
 
 wait_for_containers() {
-    wait_for containers "$@"
+	wait_for containers "$@"
 }