diff --git a/.github/workflows/address-sanitizer.yml b/.github/workflows/address-sanitizer.yml
index 4bd07027..4b0da1ce 100644
--- a/.github/workflows/address-sanitizer.yml
+++ b/.github/workflows/address-sanitizer.yml
@@ -70,7 +70,10 @@ jobs:
           path: |
             builddir/meson-logs/
             builddir/tests/*.log
-            builddir/tests/tmp.${{ matrix.token }}/p11prov-debug.log
-            builddir/tests/tmp.${{ matrix.token }}/testvars
-            builddir/tests/tmp.${{ matrix.token }}/openssl.cnf
+            builddir/tests/softhsm/p11prov-debug.log
+            builddir/tests/softhsm/testvars
+            builddir/tests/softhsm/openssl.cnf
+            builddir/tests/softtokn/p11prov-debug.log
+            builddir/tests/softtokn/testvars
+            builddir/tests/softtokn/openssl.cnf
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c4d9c8a8..df6d0d3b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,9 +99,9 @@ jobs:
           name: Test logs ${{ matrix.name }}, ${{ matrix.compiler }}, ${{ matrix.token }}
           path: |
             builddir/meson-logs/
-            builddir/tests/tmp.${{ matrix.token }}/p11prov-debug.log
-            builddir/tests/tmp.${{ matrix.token }}/testvars
-            builddir/tests/tmp.${{ matrix.token }}/openssl.cnf
+            builddir/tests/${{ matrix.token }}/p11prov-debug.log
+            builddir/tests/${{ matrix.token }}/testvars
+            builddir/tests/${{ matrix.token }}/openssl.cnf
 
       - name: Run tests with valgrind
         if : ( steps.nss-version-check.outputs.skiptest != 'true' )
@@ -116,9 +116,9 @@ jobs:
           name: Test valgrind logs ${{ matrix.name }}, ${{ matrix.compiler }}, ${{ matrix.token }}
           path: |
             builddir/meson-logs/
-            builddir/tests/tmp.${{ matrix.token }}/p11prov-debug.log
-            builddir/tests/tmp.${{ matrix.token }}/testvars
-            builddir/tests/tmp.${{ matrix.token }}/openssl.cnf
+            builddir/tests/${{ matrix.token }}/p11prov-debug.log
+            builddir/tests/${{ matrix.token }}/testvars
+            builddir/tests/${{ matrix.token }}/openssl.cnf
 
       - name: Run tests in FIPS Mode (on CentOS + gcc only)
         if : ( steps.nss-version-check.outputs.skiptest != 'true' )
@@ -134,9 +134,9 @@ jobs:
           name: Test FIPS Mode logs ${{ matrix.name }}, ${{ matrix.compiler }}, ${{ matrix.token }}
           path: |
             builddir/meson-logs/
-            builddir/tests/tmp.${{ matrix.token }}/p11prov-debug.log
-            builddir/tests/tmp.${{ matrix.token }}/testvars
-            builddir/tests/tmp.${{ matrix.token }}/openssl.cnf
+            builddir/tests/${{ matrix.token }}/p11prov-debug.log
+            builddir/tests/${{ matrix.token }}/testvars
+            builddir/tests/${{ matrix.token }}/openssl.cnf
 
 
   build-macos:
@@ -190,7 +190,7 @@ jobs:
           path: |
             builddir/meson-logs/*
             builddir/tests/*.log
-            builddir/tests/tmp.${{ matrix.token }}/p11prov-debug.log
-            builddir/tests/tmp.${{ matrix.token }}/testvars
-            builddir/tests/tmp.${{ matrix.token }}/openssl.cnf
+            builddir/tests/${{ matrix.token }}/p11prov-debug.log
+            builddir/tests/${{ matrix.token }}/testvars
+            builddir/tests/${{ matrix.token }}/openssl.cnf
 
diff --git a/.github/workflows/kryoptic.yml b/.github/workflows/kryoptic.yml
index b8c45a79..b4f7ad94 100644
--- a/.github/workflows/kryoptic.yml
+++ b/.github/workflows/kryoptic.yml
@@ -88,7 +88,7 @@ jobs:
           name: Test logs kryoptic
           path: |
             builddir/meson-logs/
-            builddir/tests/tmp.kryoptic/p11prov-debug.log
-            builddir/tests/tmp.kryoptic/testvars
-            builddir/tests/tmp.kryoptic/openssl.cnf
+            builddir/tests/kryoptic*/p11prov-debug.log
+            builddir/tests/kryoptic*/testvars
+            builddir/tests/kryoptic*/openssl.cnf
             builddir/tests/*.log
diff --git a/.gitignore b/.gitignore
index 8d7b2c41..7abfcacd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
 # project-specific ignore patterns
 tests/openssl.cnf
 tests/openssl.cnf.softhsm
-tests/tmp.softhsm
-tests/tmp.softokn
+tests/softhsm
+tests/softokn
+tests/kryoptic
+tests/kryoptic.nss
 tests/tdigests
 tests/tdigest_dupctx
 tests/tsession
diff --git a/tools/tests/test_softoken.py b/tools/tests/test_softoken.py
index 1dedb535..df1abeea 100644
--- a/tools/tests/test_softoken.py
+++ b/tools/tests/test_softoken.py
@@ -14,11 +14,11 @@
 from asn1crypto import pem
 from .. import uri2pem
 
-tokens = pathlib.Path("../tests/tmp.softokn/tokens/key4.db")
+tokens = pathlib.Path("../tests/softokn/tokens/key4.db")
 
 
 if not tokens.exists():
-    print("Run 'make check' first to create a NSS softoken in tests/tmp.softokn/tokens")
+    print("Run 'make check' first to create a NSS softoken in tests/softokn/tokens")
     raise SystemExit(1)