diff --git a/tests/Makefile.am b/tests/Makefile.am
index a469c0e5..169f108e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,6 +4,7 @@ dist_noinst_SCRIPTS = common.sh \
                       test-manpage.sh \
                       test-fuzzing.sh \
                       test-pkcs11-tool-test.sh \
+                      test-pkcs11-tool-test-threads.sh \
                       test-pkcs11-tool-sign-verify.sh \
                       test-pkcs11-tool-allowed-mechanisms.sh
 
@@ -12,6 +13,8 @@ TESTS = \
         test-duplicate-symbols.sh \
         test-pkcs11-tool-sign-verify.sh \
         test-pkcs11-tool-test.sh \
+        test-pkcs11-tool-test-threads.sh \
         test-pkcs11-tool-allowed-mechanisms.sh
 XFAIL_TESTS = \
+        test-pkcs11-tool-test-threads.sh \
         test-pkcs11-tool-test.sh
diff --git a/tests/test-pkcs11-tool-test-threads.sh b/tests/test-pkcs11-tool-test-threads.sh
new file mode 100755
index 00000000..7ec526e2
--- /dev/null
+++ b/tests/test-pkcs11-tool-test-threads.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+source common.sh
+
+echo "======================================================="
+echo "Setup SoftHSM"
+echo "======================================================="
+if [[ ! -f $P11LIB ]]; then
+    echo "WARNINIG: The SoftHSM is not installed. Can not run this test"
+    exit 77;
+fi
+
+card_setup
+
+echo "======================================================="
+echo "Test pkcs11 threads OSILGISLT0 "
+echo "======================================================="
+$PKCS11_TOOL --test-threads IN -L
+assert $? "Failed running tests"
+
+
+echo "======================================================="
+echo "Test pkcs11 threads OSILGISLT0 "
+echo "======================================================="
+$PKCS11_TOOL --test-threads OSILGISLT0 -L
+assert $? "Failed running tests"
+
+echo "======================================================="
+echo "Cleanup"
+echo "======================================================="
+card_cleanup
+
+exit $ERRORS