Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -753,22 +753,23 @@
 ;; 	     (map (lambda (testp)
 ;; 		    (last (string-split testp "/")))
 ;; 		  tests)))))
 
 (define (tests:get-test-path-from-environment)
-  (and (getenv "MT_LINKTREE")
-       (getenv "MT_TARGET")
-       (getenv "MT_RUNNAME")
-       (getenv "MT_TEST_NAME")
-       (getenv "MT_ITEMPATH")
-       (conc (getenv "MT_LINKTREE")  "/"
-	     (getenv "MT_TARGET")    "/"
-	     (getenv "MT_RUNNAME")   "/"
-	     (getenv "MT_TEST_NAME") "/"
-	     (if (or (getenv "MT_ITEMPATH")
-		     (not (string=? "" (getenv "MT_ITEMPATH"))))
-		 (conc "/" (getenv "MT_ITEMPATH"))))))
+  (if (and (getenv "MT_LINKTREE")
+	   (getenv "MT_TARGET")
+	   (getenv "MT_RUNNAME")
+	   (getenv "MT_TEST_NAME")
+	   (getenv "MT_ITEMPATH"))
+      (conc (getenv "MT_LINKTREE")  "/"
+	    (getenv "MT_TARGET")    "/"
+	    (getenv "MT_RUNNAME")   "/"
+	    (getenv "MT_TEST_NAME") "/"
+	    (if (or (getenv "MT_ITEMPATH")
+		    (not (string=? "" (getenv "MT_ITEMPATH"))))
+		(conc "/" (getenv "MT_ITEMPATH"))))
+      #f))
 
 ;; if .testconfig exists in test directory read and return it
 ;; else if have cached copy in *testconfigs* return it IFF there is a section "have fulldata"
 ;; else read the testconfig file
 ;;   if have path to test directory save the config as .testconfig and return it