diff --git a/tests/_test_encrypted_state b/tests/_test_encrypted_state
index 6401a4362..0091dd45b 100755
--- a/tests/_test_encrypted_state
+++ b/tests/_test_encrypted_state
@@ -34,8 +34,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_getcap b/tests/_test_getcap
index 6b76a5bb9..36ad46a43 100755
--- a/tests/_test_getcap
+++ b/tests/_test_getcap
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_hashing b/tests/_test_hashing
index 6e9f4b50d..ce17748e4 100755
--- a/tests/_test_hashing
+++ b/tests/_test_hashing
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_hashing2 b/tests/_test_hashing2
index 7c3d942f8..7c7b25766 100755
--- a/tests/_test_hashing2
+++ b/tests/_test_hashing2
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_init b/tests/_test_init
index 6baa52565..a3c09e3d1 100755
--- a/tests/_test_init
+++ b/tests/_test_init
@@ -27,8 +27,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_locality b/tests/_test_locality
index e23fdc22c..36f39ab78 100755
--- a/tests/_test_locality
+++ b/tests/_test_locality
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_migration_key b/tests/_test_migration_key
index e4e21cf90..4bb2381ad 100755
--- a/tests/_test_migration_key
+++ b/tests/_test_migration_key
@@ -45,8 +45,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 # make a backup of the volatile state
 TPM_PATH=$tpmstatedir
diff --git a/tests/_test_print_capabilities b/tests/_test_print_capabilities
index 87a0cbe17..3c9f19075 100755
--- a/tests/_test_print_capabilities
+++ b/tests/_test_print_capabilities
@@ -8,8 +8,8 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 PATH=$ROOT/src/swtpm:$PATH
 
-[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 if ! msg="$(${SWTPM_EXE} "${SWTPM_IFACE}" --print-capabilities 2>&1)"; then
 	echo "Error: Could not pass --print-capabilities"
diff --git a/tests/_test_print_states b/tests/_test_print_states
index 36e81c9de..5a85f3cc5 100755
--- a/tests/_test_print_states
+++ b/tests/_test_print_states
@@ -8,8 +8,8 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 PATH=$ROOT/src/swtpm:$PATH
 
-[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 trap "cleanup" SIGTERM EXIT
 
diff --git a/tests/_test_resume_volatile b/tests/_test_resume_volatile
index 383149c5c..ed293c16f 100755
--- a/tests/_test_resume_volatile
+++ b/tests/_test_resume_volatile
@@ -30,8 +30,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 TPM_PATH=$tpmstatedir
 VOLATILE_STATE_FILE="$TPM_PATH/tpm-00.volatilestate"
diff --git a/tests/_test_save_load_encrypted_state b/tests/_test_save_load_encrypted_state
index 870fdf7a0..821363b22 100755
--- a/tests/_test_save_load_encrypted_state
+++ b/tests/_test_save_load_encrypted_state
@@ -34,8 +34,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_save_load_state b/tests/_test_save_load_state
index 2434e270f..e93619f93 100755
--- a/tests/_test_save_load_state
+++ b/tests/_test_save_load_state
@@ -38,8 +38,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_setbuffersize b/tests/_test_setbuffersize
index 9815305bd..b2bbfd388 100755
--- a/tests/_test_setbuffersize
+++ b/tests/_test_setbuffersize
@@ -27,8 +27,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_swtpm_bios b/tests/_test_swtpm_bios
index 88346504f..50522f264 100755
--- a/tests/_test_swtpm_bios
+++ b/tests/_test_swtpm_bios
@@ -27,8 +27,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_avoid_da_lockout b/tests/_test_tpm2_avoid_da_lockout
index 6ee4c6453..e4f0121a9 100755
--- a/tests/_test_tpm2_avoid_da_lockout
+++ b/tests/_test_tpm2_avoid_da_lockout
@@ -24,9 +24,9 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
 source "${TESTDIR}/test_common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--tpm2 \
diff --git a/tests/_test_tpm2_derived_keys b/tests/_test_tpm2_derived_keys
index 722aaacb4..f8db144f0 100755
--- a/tests/_test_tpm2_derived_keys
+++ b/tests/_test_tpm2_derived_keys
@@ -30,8 +30,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 TPM_PATH=$tpmstatedir
 
diff --git a/tests/_test_tpm2_encrypted_state b/tests/_test_tpm2_encrypted_state
index a9f3162c0..967d3d08d 100755
--- a/tests/_test_tpm2_encrypted_state
+++ b/tests/_test_tpm2_encrypted_state
@@ -34,8 +34,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_file_permissions b/tests/_test_tpm2_file_permissions
index 5808d1a6c..4a5bc2eb6 100644
--- a/tests/_test_tpm2_file_permissions
+++ b/tests/_test_tpm2_file_permissions
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 SWTPM_SETUP_CONF=${TPM_PATH}/swtpm_setup.conf
 
 cat <<_EOF_ > "${SWTPM_SETUP_CONF}"
diff --git a/tests/_test_tpm2_getcap b/tests/_test_tpm2_getcap
index 958a46de0..889d65204 100755
--- a/tests/_test_tpm2_getcap
+++ b/tests/_test_tpm2_getcap
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_hashing b/tests/_test_tpm2_hashing
index b5e9b3851..e63e817ba 100755
--- a/tests/_test_tpm2_hashing
+++ b/tests/_test_tpm2_hashing
@@ -27,8 +27,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_hashing2 b/tests/_test_tpm2_hashing2
index 28a34a916..06a89907c 100755
--- a/tests/_test_tpm2_hashing2
+++ b/tests/_test_tpm2_hashing2
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_hashing3 b/tests/_test_tpm2_hashing3
index 7a2492e5b..98d25e139 100755
--- a/tests/_test_tpm2_hashing3
+++ b/tests/_test_tpm2_hashing3
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_init b/tests/_test_tpm2_init
index 9963de791..65c6cdaa6 100755
--- a/tests/_test_tpm2_init
+++ b/tests/_test_tpm2_init
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_locality b/tests/_test_tpm2_locality
index 770bbcd1f..8087cf33d 100755
--- a/tests/_test_tpm2_locality
+++ b/tests/_test_tpm2_locality
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_migration_key b/tests/_test_tpm2_migration_key
index c469ae439..cd4e0614d 100755
--- a/tests/_test_tpm2_migration_key
+++ b/tests/_test_tpm2_migration_key
@@ -46,8 +46,8 @@ logfile="$(mktemp)" || exit 1
 SWTPM_CMD_UNIX_PATH=${tpmstatedir}/unix-cmd.sock
 SWTPM_CTRL_UNIX_PATH=${tpmstatedir}/unix-ctrl.sock
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 # make a backup of the volatile state
 TPM_PATH=$tpmstatedir
diff --git a/tests/_test_tpm2_print_capabilities b/tests/_test_tpm2_print_capabilities
index c4f5507bb..e96cf9f41 100755
--- a/tests/_test_tpm2_print_capabilities
+++ b/tests/_test_tpm2_print_capabilities
@@ -8,8 +8,8 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 PATH=$ROOT/src/swtpm:$PATH
 
-[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 if ! msg="$(${SWTPM_EXE} "${SWTPM_IFACE}" --tpm2 --print-capabilities 2>&1)"; then
 	echo "Error: Could not pass --print-capabilities"
diff --git a/tests/_test_tpm2_print_states b/tests/_test_tpm2_print_states
index eb68b678c..f981e91d4 100755
--- a/tests/_test_tpm2_print_states
+++ b/tests/_test_tpm2_print_states
@@ -8,8 +8,8 @@ TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
 PATH=$ROOT/src/swtpm:$PATH
 
-[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_IFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 trap "cleanup" SIGTERM EXIT
 
diff --git a/tests/_test_tpm2_probe b/tests/_test_tpm2_probe
index 206564e62..4d5358df9 100755
--- a/tests/_test_tpm2_probe
+++ b/tests/_test_tpm2_probe
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_resume_volatile b/tests/_test_tpm2_resume_volatile
index 9c2ea5140..960f89894 100755
--- a/tests/_test_tpm2_resume_volatile
+++ b/tests/_test_tpm2_resume_volatile
@@ -30,8 +30,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 TPM_PATH=$tpmstatedir
 VOLATILE_STATE_FILE="$TPM_PATH/tpm2-00.volatilestate"
diff --git a/tests/_test_tpm2_save_load_encrypted_state b/tests/_test_tpm2_save_load_encrypted_state
index e99d52339..add9dd4c6 100755
--- a/tests/_test_tpm2_save_load_encrypted_state
+++ b/tests/_test_tpm2_save_load_encrypted_state
@@ -34,8 +34,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_save_load_state b/tests/_test_tpm2_save_load_state
index 8a4d6a4df..7d9b228ad 100755
--- a/tests/_test_tpm2_save_load_state
+++ b/tests/_test_tpm2_save_load_state
@@ -31,8 +31,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_save_load_state_da_timeout b/tests/_test_tpm2_save_load_state_da_timeout
index 6eb01cce1..4dee0054d 100755
--- a/tests/_test_tpm2_save_load_state_da_timeout
+++ b/tests/_test_tpm2_save_load_state_da_timeout
@@ -32,8 +32,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_save_load_state_locking b/tests/_test_tpm2_save_load_state_locking
index 93db17c7e..56abbbd46 100755
--- a/tests/_test_tpm2_save_load_state_locking
+++ b/tests/_test_tpm2_save_load_state_locking
@@ -28,8 +28,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" \
 	--migration release-lock-outgoing \
diff --git a/tests/_test_tpm2_savestate b/tests/_test_tpm2_savestate
index 70dfaf6bb..8f8f5150b 100755
--- a/tests/_test_tpm2_savestate
+++ b/tests/_test_tpm2_savestate
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_setbuffersize b/tests/_test_tpm2_setbuffersize
index 9a42ccfb3..e4bfb8a2d 100755
--- a/tests/_test_tpm2_setbuffersize
+++ b/tests/_test_tpm2_setbuffersize
@@ -27,8 +27,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_swtpm_bios b/tests/_test_tpm2_swtpm_bios
index 1991b350e..71bd63cf0 100755
--- a/tests/_test_tpm2_swtpm_bios
+++ b/tests/_test_tpm2_swtpm_bios
@@ -27,8 +27,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_volatilestate b/tests/_test_tpm2_volatilestate
index 02061d5ca..11488abb2 100755
--- a/tests/_test_tpm2_volatilestate
+++ b/tests/_test_tpm2_volatilestate
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm2_wrongorder b/tests/_test_tpm2_wrongorder
index 748f524d9..589b8989c 100755
--- a/tests/_test_tpm2_wrongorder
+++ b/tests/_test_tpm2_wrongorder
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_tpm_probe b/tests/_test_tpm_probe
index eb9ae7d1f..3d3a43ac7 100755
--- a/tests/_test_tpm_probe
+++ b/tests/_test_tpm_probe
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_volatilestate b/tests/_test_volatilestate
index 35b5eb105..15d996dbc 100755
--- a/tests/_test_volatilestate
+++ b/tests/_test_volatilestate
@@ -26,8 +26,8 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/_test_wrongorder b/tests/_test_wrongorder
index def258664..505d1da33 100755
--- a/tests/_test_wrongorder
+++ b/tests/_test_wrongorder
@@ -27,9 +27,9 @@ function cleanup()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 source "${TESTDIR}/common"
 source "${TESTDIR}/test_common"
+[ "${SWTPM_INTERFACE}" == cuse ] && source "${TESTDIR}/test_cuse"
 
 rm -f "$STATE_FILE" "$VOLATILE_STATE_FILE" 2>/dev/null
 
diff --git a/tests/test_cuse b/tests/test_cuse
index ae20746a5..0ac4dd807 100644
--- a/tests/test_cuse
+++ b/tests/test_cuse
@@ -13,8 +13,12 @@ if [ "$(id -u)" -ne 0 ]; then
 	exit 77
 fi
 
-if ! grep -q -E '#[[:blank:]]*define[[:blank:]]+WITH_CUSE[[:blank:]]+1[[:blank:]]*$' \
-		"${PWD}/../config.h"; then
+if [ -z "${SWTPM_EXE}" ]; then
+	echo "Error: SWTPM_EXE must be set"
+	exit 1
+fi
+
+if ! ${SWTPM_EXE} --help | grep -q cuse; then
 	echo "Skipping test: swtpm was not compiled with CUSE interface"
 	exit 77
 fi
diff --git a/tests/test_tpm2_partial_reads b/tests/test_tpm2_partial_reads
index b0ed3e8b2..d0633ec65 100755
--- a/tests/test_tpm2_partial_reads
+++ b/tests/test_tpm2_partial_reads
@@ -33,8 +33,8 @@ function swtpm_read_n_bytes_fd100()
 
 trap "cleanup" EXIT
 
-[ "${SWTPM_INTERFACE}" == "cuse" ] && source test_cuse
 source common
+[ "${SWTPM_INTERFACE}" == "cuse" ] && source test_cuse
 skip_test_no_tpm20 "${SWTPM_EXE}"
 
 TPM_PATH=$TPM_PATH run_swtpm "${SWTPM_INTERFACE}" --tpm2