diff --git a/TEST b/TEST
index fbc47a4e2869..df1a3c9de177 100644
--- a/TEST
+++ b/TEST
@@ -8,20 +8,20 @@
 #TEST_SPLAT_OPTIONS="-acvx"
 
 ### ztest
-#TEST_ZTEST_SKIP="yes"
+TEST_ZTEST_SKIP="yes"
 #TEST_ZTEST_TIMEOUT=1800
 #TEST_ZTEST_DIR="/var/tmp/"
 #TEST_ZTEST_OPTIONS="-V"
 
 ### zimport
-#TEST_ZIMPORT_SKIP="yes"
+TEST_ZIMPORT_SKIP="yes"
 #TEST_ZIMPORT_DIR="/var/tmp/zimport"
 #TEST_ZIMPORT_VERSIONS="master installed"
 #TEST_ZIMPORT_POOLS="zol-0.6.1 zol-0.6.2 master installed"
 #TEST_ZIMPORT_OPTIONS="-c"
 
 ### xfstests
-#TEST_XFSTESTS_SKIP="yes"
+TEST_XFSTESTS_SKIP="yes"
 #TEST_XFSTESTS_URL="https://github.com/behlendorf/xfstests/archive/"
 #TEST_XFSTESTS_VER="zfs.tar.gz"
 #TEST_XFSTESTS_POOL="tank"
@@ -33,7 +33,7 @@
 #TEST_ZFSTESTS_SKIP="yes"
 #TEST_ZFSTESTS_DISKS="vdb vdc vdd"
 #TEST_ZFSTESTS_DISKSIZE="8G"
-#TEST_ZFSTESTS_RUNFILE="linux.run"
+TEST_ZFSTESTS_RUNFILE="zvol-open-deadlock.run"
 
 ### filebench
 #TEST_FILEBENCH_SKIP="yes"
@@ -47,7 +47,7 @@
 #TEST_FILEBENCH_OPTIONS=""
 
 ### zfsstress
-#TEST_ZFSSTRESS_SKIP="yes"
+TEST_ZFSSTRESS_SKIP="yes"
 #TEST_ZFSSTRESS_URL="https://github.com/nedbass/zfsstress/archive/"
 #TEST_ZFSSTRESS_VER="master.tar.gz"
 #TEST_ZFSSTRESS_RUNTIME=300
diff --git a/tests/runfiles/zvol-open-deadlock.run b/tests/runfiles/zvol-open-deadlock.run
new file mode 100644
index 000000000000..1087aa01086c
--- /dev/null
+++ b/tests/runfiles/zvol-open-deadlock.run
@@ -0,0 +1,41 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+[DEFAULT]
+pre = setup
+quiet = False
+pre_user = root
+user = root
+timeout = 30
+post_user = root
+post = cleanup
+outputdir = /var/tmp/test_results
+
+[tests/functional/cli_root/zpool_destroy]
+tests = ['zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos',
+    'zpool_destroy_001_pos', 'zpool_destroy_001_pos', 'zpool_destroy_001_pos']
+pre =
+post =
diff --git a/tests/test-runner/include/logapi.shlib b/tests/test-runner/include/logapi.shlib
index d9f276e0e7ea..01ccb00d1e82 100644
--- a/tests/test-runner/include/logapi.shlib
+++ b/tests/test-runner/include/logapi.shlib
@@ -29,6 +29,8 @@
 
 . ${STF_TOOLS}/include/stf.shlib
 
+trap 'log_timed_out "Test killed by SIGTERM' TERM
+
 # Output an assertion
 #
 # $@ - assertion text
@@ -418,7 +420,7 @@ function _endlog
 	typeset logfile="/tmp/log.$$"
 	_recursive_output $logfile
 
-	if [[ $1 == $STF_FAIL ]] ; then
+	if [[ $1 == $STF_FAIL ]] || [[ $1 == $STF_TIMED_OUT ]]; then
 		_execute_testfail_callbacks
 	fi
 
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh
index 687eef5972e8..6cdd06ba4409 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh
@@ -45,11 +45,6 @@
 
 verify_runnable "global"
 
-# https://github.com/zfsonlinux/zfs/issues/6145
-if is_linux; then
-	log_unsupported "Test case occasionally fails"
-fi
-
 function cleanup
 {
 	poolexists $TESTPOOL2 && destroy_pool $TESTPOOL2
@@ -71,7 +66,6 @@ if ! $(is_physical_device $DISKS) ; then
 fi
 
 log_assert "'zpool destroy <pool>' can destroy a specified pool."
-
 log_onexit cleanup
 
 partition_disk $SLICE_SIZE $DISK 2