diff --git a/tests/tpm2dtests/Makefile.am b/tests/tpm2dtests/Makefile.am
index 72ad11d9b..6048d201c 100644
--- a/tests/tpm2dtests/Makefile.am
+++ b/tests/tpm2dtests/Makefile.am
@@ -34,10 +34,10 @@ TESTS_ENVIRONMENT = LC_ALL=C \
 	PATH="../gpgscm:$(PATH)" \
 	abs_top_srcdir="$(abs_top_srcdir)" \
 	objdir="$(abs_top_builddir)" \
-	TPMSERVER="$(TPMSERVER)" \
+	TPMSERVER="$(TPMSERVER)" TSSSTARTUP="$(TSSSTARTUP)" \
 	SWTPM="$(SWTPM)" \
 	SWTPM_IOCTL="$(SWTPM_IOCTL)" \
-        GNUPG_BUILD_ROOT="$(abs_top_builddir)/tests" \
+        GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
 	GNUPG_IN_TEST_SUITE=fact \
 	GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
 
diff --git a/tests/tpm2dtests/all-tests.scm b/tests/tpm2dtests/all-tests.scm
index bf7a981ca..8934f01f2 100644
--- a/tests/tpm2dtests/all-tests.scm
+++ b/tests/tpm2dtests/all-tests.scm
@@ -30,8 +30,9 @@
    (make-environment-cache
     (test::scm
      #f
-     (path-join "tests" "openpgp" "setup.scm")
-     (in-srcdir "tests" "openpgp" "setup.scm"))))
+     #f
+     (path-join "tests" "tpm2dtests" "setup.scm")
+     (in-srcdir "tests" "tpm2dtests" "setup.scm"))))
 
  (define (qualify path variant)
    (string-append "<" variant ">" path))
@@ -40,8 +41,9 @@
    (make-environment-cache
     (test::scm
      #f
-     (qualify (path-join "tests" "openpgp" "setup.scm") variant)
-     (in-srcdir "tests" "openpgp" "setup.scm")
+     variant
+     (path-join "tests" "tpm2dtests" "setup.scm")
+     (in-srcdir "tests" "tpm2dtests" "setup.scm")
      (string-append "--" variant))))
 
  (define setup-use-keyring (setup* "use-keyring"))
@@ -55,7 +57,8 @@
  (define tests
    (map (lambda (name)
 	  (test::scm setup
-		     (qualify (path-join "tests" "tpm2dtests" name) "standard")
+                     "standards"
+		     (path-join "tests" "tpm2dtests" name)
 		     (in-srcdir "tests" "tpm2dtests" name))) all-tests))
 
  (when *run-all-tests*
@@ -65,15 +68,15 @@
               ;; The second pass uses the keyboxd
 	      (map (lambda (name)
 		     (test::scm setup-use-keyboxd
-				(qualify (path-join "tests" "tpm2dtests" name)
-					 "keyboxd")
+                                "keyboxd"
+				(path-join "tests" "tpm2dtests" name)
 				(in-srcdir "tests" "tpm2dtests" name)
 				"--use-keyboxd")) all-tests)
               ;; The third pass uses the legact pubring.gpg
 	      (map (lambda (name)
 		     (test::scm setup-use-keyring
-				(qualify (path-join "tests" "tpm2dtests" name)
-					 "keyring")
+                                "keyring"
+				(path-join "tests" "tpm2dtests" name)
 				(in-srcdir "tests" "tpm2dtests" name)
 				"--use-keyring")) all-tests)
               )))
diff --git a/tests/tpm2dtests/run-tests.scm b/tests/tpm2dtests/run-tests.scm
index fdf1859a8..638d3a8a1 100644
--- a/tests/tpm2dtests/run-tests.scm
+++ b/tests/tpm2dtests/run-tests.scm
@@ -29,6 +29,7 @@
 (define setup
   (make-environment-cache (test::scm
 			   #f
+                           #f
 			   (path-join "tests" "tpm2dtests" "setup.scm")
 			   (in-srcdir "tests" "tpm2dtests" "setup.scm"))))
 
@@ -38,6 +39,7 @@
 	      (load-tests "tests" "tpm2dtests")
 	      (map (lambda (name)
 		      (test::scm setup
+			         #f
 				 (path-join "tests" "tpm2dtests" name)
 				 (in-srcdir "tests" "tpm2dtests" name)
 				 "--use-keyring")) tests)))