diff --git a/test/dsa_user_test_runner.sh b/test/dsa_user_test_runner.sh
index 6c9f771..4504d9c 100755
--- a/test/dsa_user_test_runner.sh
+++ b/test/dsa_user_test_runner.sh
@@ -6,7 +6,8 @@
 
 rc="$EXIT_SKIP"
 
-DSA=dsa0
+DEV=`ls /dev/dsa/ | sed -ne 's|wq\([^.]\+\)\(.*\)|dsa\1/wq\1\2|p'`
+DSA=`echo $DEV | cut -f1 -d/`
 WQ0=wq0.0
 WQ1=wq0.1
 
@@ -70,7 +71,7 @@ test_op()
 		for xfer_size in $SIZE_1 $SIZE_4K $SIZE_64K $SIZE_1M $SIZE_2M; do
 			echo "Testing $xfer_size bytes"
 			"$DSATEST" -w "$wq_mode_code" -l "$xfer_size" -o "$opcode" \
-				-f "$flag" t200 -v
+				-f "$flag" t200 -d "$DEV"
 		done
 	done
 }
@@ -99,7 +100,7 @@ test_op_batch()
 		for xfer_size in $SIZE_1 $SIZE_4K $SIZE_64K $SIZE_1M $SIZE_2M; do
 			echo "Testing $xfer_size bytes"
 			"$DSATEST" -w "$wq_mode_code" -l "$xfer_size" -o 0x1 -b "$opcode" \
-				-c 16 -f "$flag" t2000 -v
+				-c 16 -f "$flag" t2000 -d "$DEV"
 		done
 	done
 }
@@ -124,7 +125,7 @@ test_dif_op()
 		for xfer_size in $SIZE_512 $SIZE_1K $SIZE_4K; do
 			echo "Testing $xfer_size bytes"
 			"$DSATEST" -w "$wq_mode_code" -l "$xfer_size" -o "$opcode" \
-				-f "$flag" t200 -v
+				-f "$flag" t200 -d "$DEV"
 		done
 	done
 }
@@ -149,13 +150,10 @@ test_dif_op_batch()
 		for xfer_size in $SIZE_512 $SIZE_1K $SIZE_4K; do
 			echo "Testing $xfer_size bytes"
 			"$DSATEST" -w "$wq_mode_code" -l "$xfer_size" -o 0x1 -b "$opcode" \
-				-c 16 -f "$flag" t2000 -v
+				-c 16 -f "$flag" t2000 -d "$DEV"
 		done
 	done
 }
-_cleanup
-start_dsa
-enable_wqs
 # shellcheck disable=SC2034
 rc="$EXIT_FAILURE"
 
@@ -188,7 +186,3 @@ for opcode in "0x12" "0x13" "0x14" "0x15"; do
 	test_dif_op_batch $opcode $flag
 done
 
-disable_wqs
-stop_dsa
-_cleanup
-exit 0
diff --git a/test/iaa_user_test_runner.sh b/test/iaa_user_test_runner.sh
index c8f2686..9156a94 100755
--- a/test/iaa_user_test_runner.sh
+++ b/test/iaa_user_test_runner.sh
@@ -6,7 +6,8 @@
 
 rc="$EXIT_SKIP"
 
-IAA=iax1
+DEV=`ls /dev/iax/ | sed -ne 's|wq\([^.]\+\)\(.*\)|iax\1/wq\1\2|p'`
+IAA=`echo $DEV | cut -f1 -d/`
 WQ0=wq1.4
 WQ1=wq1.1
 DBDF=`ls -l /sys/bus/dsa/devices/iax3 | awk -F '/' '{print $(NF - 1)}'`
@@ -104,10 +105,10 @@ test_op()
 			if [ "$extra_flag" != "" ]
 			then
 				"$IAATEST" -w "$wq_mode_code" -l "$xfer_size" -o "$opcode" \
-					-f "$flag" -1 "$extra_flag" -t 5000 -v
+					-f "$flag" -1 "$extra_flag" -t 5000 -d "$DEV"
 			else
 				"$IAATEST" -w "$wq_mode_code" -l "$xfer_size" -o "$opcode" \
-					-f "$flag" -t 5000 -v
+					-f "$flag" -t 5000 -d "$DEV"
 			fi
 		done
 	done
@@ -123,121 +124,121 @@ test_op_filter()
 		wq_mode_name=$(wq_mode2name "$wq_mode_code")
 
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 512 -2 0x7c -3 128 \
-			-o 0x50 -t 5000 -v
+			-o 0x50 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1024 -2 0x7c -3 256 \
-			-o 0x50 -t 5000 -v
+			-o 0x50 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 4096 -2 0x7c -3 1024 \
-			-o 0x50 -t 5000 -v
+			-o 0x50 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 65536 -2 0x7c -3 16384 \
-			-o 0x50 -t 5000 -v
+			-o 0x50 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1048576 -2 0x7c -3 262144 \
-			-o 0x50 -t 5000 -v
+			-o 0x50 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 2097152 -2 0x7c -3 524288 \
-			-o 0x50 -t 5000 -v
+			-o 0x50 -t 5000 -d "$DEV"
 
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 512 -2 0x38 -3 256 \
-			-o 0x51 -t 5000 -v
+			-o 0x51 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1024 -2 0x38 -3 512 \
-			-o 0x51 -t 5000 -v
+			-o 0x51 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 4096 -2 0x38 -3 2048 \
-			-o 0x51 -t 5000 -v
+			-o 0x51 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 65536 -2 0x38 -3 32768 \
-			-o 0x51 -t 5000 -v
+			-o 0x51 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1048576 -2 0x38 -3 524288 \
-			-o 0x51 -t 5000 -v
+			-o 0x51 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 2097152 -2 0x38 -3 1048576 \
-			-o 0x51 -t 5000 -v
+			-o 0x51 -t 5000 -d "$DEV"
 
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 512 -2 0x7c -3 128 \
-			-o 0x52 -t 5000 -v
+			-o 0x52 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1024 -2 0x7c -3 256 \
-			-o 0x52 -t 5000 -v
+			-o 0x52 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 4096 -2 0x7c -3 1024 \
-			-o 0x52 -t 5000 -v
+			-o 0x52 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 65536 -2 0x7c -3 16384 \
-			-o 0x52 -t 5000 -v
+			-o 0x52 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1048576 -2 0x7c -3 262144 \
-			-o 0x52 -t 5000 -v
+			-o 0x52 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 2097152 -2 0x7c -3 524288 \
-			-o 0x52 -t 5000 -v
+			-o 0x52 -t 5000 -d "$DEV"
 
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 512 -2 0x7c -3 128 \
-			-o 0x53 -t 5000 -v
+			-o 0x53 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1024 -2 0x7c -3 256 \
-			-o 0x53 -t 5000 -v
+			-o 0x53 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 4096 -2 0x7c -3 1024 \
-			-o 0x53 -t 5000 -v
+			-o 0x53 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 65536 -2 0x7c -3 16384 \
-			-o 0x53 -t 5000 -v
+			-o 0x53 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1048576 -2 0x7c -3 262144 \
-			-o 0x53 -t 5000 -v
+			-o 0x53 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 2097152 -2 0x7c -3 524288 \
-			-o 0x53 -t 5000 -v
+			-o 0x53 -t 5000 -d "$DEV"
 
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 512 -2 0x1c -3 512 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1024 -2 0x1c -3 1024 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 4096 -2 0x1c -3 4096 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 32768 -2 0x1c -3 32768 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 65536 -2 0x1c -3 65536 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 131072 -2 0x1c -3 131072 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 32 -2 0x3c -3 16 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 64 -2 0x3c -3 32 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 128 -2 0x3c -3 64 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 256 -2 0x3c -3 128 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 512 -2 0x3c -3 256 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1024 -2 0x3c -3 512 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 64 -2 0x7c -3 16 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 128 -2 0x7c -3 32 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 256 -2 0x7c -3 64 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 512 -2 0x7c -3 128 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1024 -2 0x7c -3 256 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 2048 -2 0x7c -3 512 \
-			-o 0x54 -t 5000 -v
+			-o 0x54 -t 5000 -d "$DEV"
 
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 512 -2 0x38 -3 256 \
-			-o 0x55 -t 5000 -v
+			-o 0x55 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1024 -2 0x38 -3 512 \
-			-o 0x55 -t 5000 -v
+			-o 0x55 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 4096 -2 0x38 -3 2048 \
-			-o 0x55 -t 5000 -v
+			-o 0x55 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 65536 -2 0x38 -3 32768 \
-			-o 0x55 -t 5000 -v
+			-o 0x55 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1048576 -2 0x38 -3 524288 \
-			-o 0x55 -t 5000 -v
+			-o 0x55 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 2097152 -2 0x38 -3 1048576 \
-			-o 0x55 -t 5000 -v
+			-o 0x55 -t 5000 -d "$DEV"
 
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 512 -2 0x7c -3 128 \
-			-o 0x56 -t 5000 -v
+			-o 0x56 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1024 -2 0x7c -3 256 \
-			-o 0x56 -t 5000 -v
+			-o 0x56 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 4096 -2 0x7c -3 1024 \
-			-o 0x56 -t 5000 -v
+			-o 0x56 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 65536 -2 0x7c -3 16384 \
-			-o 0x56 -t 5000 -v
+			-o 0x56 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 1048576 -2 0x7c -3 262144 \
-			-o 0x56 -t 5000 -v
+			-o 0x56 -t 5000 -d "$DEV"
 		./iaa_test -w "$wq_mode_code" -f "$flag" -l 2097152 -2 0x7c -3 524288 \
-			-o 0x56 -t 5000 -v
+			-o 0x56 -t 5000 -d "$DEV"
 	done
 }
 
@@ -286,9 +287,6 @@ test_op_transl_fetch()
 	done
 }
 
-_cleanup
-start_iaa
-enable_wqs
 # shellcheck disable=SC2034
 rc="$EXIT_FAILURE"
 
@@ -322,69 +320,12 @@ unset SIZE_1
 
 flag="0x1"
 echo "Testing with 'block on fault' flag ON"
-for opcode in "0x4d" "0x49" "0x4c" "0x48" "0x43" "0x42"; do
+for opcode in "0x4d" "0x49" "0x4c" "0x48" "0x43"; do
 	test_op $opcode $flag
 done
 
 flag="0x0"
 echo "Testing with 'block on fault' flag OFF"
-for opcode in "0x4d" "0x49" "0x4c" "0x48" "0x43" "0x42"; do
+for opcode in "0x4d" "0x49" "0x4c" "0x48" "0x43"; do
 	test_op $opcode $flag
 done
-
-if [ "$IDXD_VERSION" != "0x100" ]; then
-	flag="0x1"
-	echo "Testing with 'block on fault' flag ON"
-	for opcode in "0x4e" "0x4a"; do
-		test_op $opcode $flag
-	done
-
-	flag="0x0"
-	echo "Testing with 'block on fault' flag OFF"
-	for opcode in "0x4e" "0x4a"; do
-		test_op $opcode $flag
-	done
-fi
-
-flag="0x1"
-test_op_filter $flag
-
-flag="0x0"
-test_op_filter $flag
-
-if [ "$IDXD_VERSION" != "0x100" ]; then
-	flag="0x1"
-	aecs_flag="0x0101"
-	echo "Testing with 'block on fault' flag ON"
-	for opcode in "0x41" "0x40"; do
-		test_op_crypto $opcode $flag $aecs_flag
-	done
-
-	flag="0x0"
-	aecs_flag="0x0301"
-	echo "Testing with 'block on fault' flag OFF"
-	for opcode in "0x41" "0x40"; do
-		test_op_crypto $opcode $flag $aecs_flag
-	done
-
-	bind_vfio
-
-	flag="0x1"
-	echo "Testing with 'block on fault' flag ON"
-	for opcode in "0x0a"; do
-		test_op_transl_fetch $opcode $flag
-	done
-
-	flag="0x0"
-	echo "Testing with 'block on fault' flag OFF"
-	for opcode in "0x0a"; do
-		test_op_transl_fetch $opcode $flag
-	done
-
-	unbind_vfio
-fi
-
-disable_wqs
-stop_iaa
-_cleanup
-exit 0