diff --git a/test/lib/setup b/test/lib/setup
index 69eb898..d858c71 100755
--- a/test/lib/setup
+++ b/test/lib/setup
@@ -23,6 +23,11 @@ setup_build() {
 	layout_host
 }
 
+# setup_distro() - Set up pane layout for distro tests
+setup_distro() {
+	layout_host
+}
+
 # setup_passt() - Start qemu and passt
 setup_passt() {
 	layout_passt
@@ -281,6 +286,16 @@ setup_two_guests() {
 	pane_status GUEST_2
 }
 
+# teardown_build() - Nothing to do, yet
+teardown_build() {
+    :
+}
+
+# teardown_distro() - Nothing to do, yet
+teardown_distro() {
+    :
+}
+
 # teardown_passt() - Kill qemu, remove passt PID file
 teardown_passt() {
 	tmux send-keys -t ${PANE_GUEST} "C-c"
diff --git a/test/run b/test/run
index 258a89b..efec955 100755
--- a/test/run
+++ b/test/run
@@ -63,10 +63,14 @@ run() {
 	test build/all
 	test build/cppcheck
 	test build/clang_tidy
+	teardown build
+
+	setup distro
 	test distro/debian
 	test distro/fedora
 	test distro/opensuse
 	test distro/ubuntu
+	teardown distro
 
 	setup pasta
 	test ndp/pasta