diff --git a/test/kpod_attach.bats b/test/kpod_attach.bats
index 9687959355..fe2781f8dd 100644
--- a/test/kpod_attach.bats
+++ b/test/kpod_attach.bats
@@ -7,6 +7,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_create.bats b/test/kpod_create.bats
index e1a1873320..e4903f6aa5 100644
--- a/test/kpod_create.bats
+++ b/test/kpod_create.bats
@@ -3,6 +3,7 @@
 load helpers
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_diff.bats b/test/kpod_diff.bats
index d73f462f6d..5b71dfd484 100644
--- a/test/kpod_diff.bats
+++ b/test/kpod_diff.bats
@@ -3,6 +3,7 @@
 load helpers
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_export.bats b/test/kpod_export.bats
index 5b8517afc1..59942ea577 100644
--- a/test/kpod_export.bats
+++ b/test/kpod_export.bats
@@ -7,6 +7,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_history.bats b/test/kpod_history.bats
index 5e99696b23..466b977db3 100644
--- a/test/kpod_history.bats
+++ b/test/kpod_history.bats
@@ -7,6 +7,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_import.bats b/test/kpod_import.bats
index 204cf2963f..7348a3c82d 100644
--- a/test/kpod_import.bats
+++ b/test/kpod_import.bats
@@ -9,6 +9,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_inspect.bats b/test/kpod_inspect.bats
index 86a4e7698f..7a63208e9b 100644
--- a/test/kpod_inspect.bats
+++ b/test/kpod_inspect.bats
@@ -7,6 +7,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_kill.bats b/test/kpod_kill.bats
index 6f4f2e2687..2bd7492390 100644
--- a/test/kpod_kill.bats
+++ b/test/kpod_kill.bats
@@ -7,6 +7,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_load.bats b/test/kpod_load.bats
index abbe8ee5de..59b4a4e501 100644
--- a/test/kpod_load.bats
+++ b/test/kpod_load.bats
@@ -3,6 +3,7 @@
 load helpers
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_logs.bats b/test/kpod_logs.bats
index d5dc8622e2..719dd6b061 100644
--- a/test/kpod_logs.bats
+++ b/test/kpod_logs.bats
@@ -7,6 +7,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_mount.bats b/test/kpod_mount.bats
index aced0858d7..12c41c071e 100644
--- a/test/kpod_mount.bats
+++ b/test/kpod_mount.bats
@@ -9,6 +9,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_pause.bats b/test/kpod_pause.bats
index d26f0e4e1c..1a9bd7dda4 100644
--- a/test/kpod_pause.bats
+++ b/test/kpod_pause.bats
@@ -3,6 +3,7 @@
 load helpers
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_ps.bats b/test/kpod_ps.bats
index 977266f592..3f4758f597 100644
--- a/test/kpod_ps.bats
+++ b/test/kpod_ps.bats
@@ -4,6 +4,7 @@ load helpers
 
 IMAGE="redis:alpine"
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_push.bats b/test/kpod_push.bats
index dee29a64c9..967aa6da38 100644
--- a/test/kpod_push.bats
+++ b/test/kpod_push.bats
@@ -7,6 +7,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_rm.bats b/test/kpod_rm.bats
index 3a7821b564..02e184f4c1 100644
--- a/test/kpod_rm.bats
+++ b/test/kpod_rm.bats
@@ -3,6 +3,7 @@
 load helpers
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_run.bats b/test/kpod_run.bats
index ccbeaac6c7..f01d254cc8 100644
--- a/test/kpod_run.bats
+++ b/test/kpod_run.bats
@@ -7,6 +7,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_run_ns.bats b/test/kpod_run_ns.bats
index c1b269587a..a1b364f8bb 100644
--- a/test/kpod_run_ns.bats
+++ b/test/kpod_run_ns.bats
@@ -7,6 +7,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_save.bats b/test/kpod_save.bats
index 56f23db91a..03d24ed867 100644
--- a/test/kpod_save.bats
+++ b/test/kpod_save.bats
@@ -7,6 +7,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_start.bats b/test/kpod_start.bats
index 74a7d7edfe..999b299827 100644
--- a/test/kpod_start.bats
+++ b/test/kpod_start.bats
@@ -3,6 +3,7 @@
 load helpers
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_stats.bats b/test/kpod_stats.bats
index 8eb1124961..b4c879c466 100644
--- a/test/kpod_stats.bats
+++ b/test/kpod_stats.bats
@@ -7,6 +7,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_stop.bats b/test/kpod_stop.bats
index 3804147fde..0822d88f50 100644
--- a/test/kpod_stop.bats
+++ b/test/kpod_stop.bats
@@ -7,6 +7,7 @@ function teardown() {
 }
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
diff --git a/test/kpod_wait.bats b/test/kpod_wait.bats
index b7bcb072cb..871c9f5bfa 100644
--- a/test/kpod_wait.bats
+++ b/test/kpod_wait.bats
@@ -3,9 +3,14 @@
 load helpers
 
 function setup() {
+    prepare_network_conf
     copy_images
 }
 
+function teardown() {
+    cleanup_test
+}
+
 @test "wait on a bogus container" {
     run ${KPOD_BINARY} ${KPOD_OPTIONS} wait 12343
     echo $output