diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
index 0c02c349a..329a31a58 100644
--- a/tests/gpgscm/tests.scm
+++ b/tests/gpgscm/tests.scm
@@ -271,9 +271,11 @@
 ;; generic name is used.  Returns an absolute path.
 (define (mkdtemp . components)
   (canonical-path (_mkdtemp (if (null? components)
-				(string-append "gpgscm-" (get-isotime) "-"
-					       (basename-suffix *scriptname* ".scm")
-					       "-XXXXXX")
+				(path-join
+				 (if *win32* (getenv "Temp") "/tmp")
+				 (string-append "gpgscm-" (get-isotime) "-"
+						(basename-suffix *scriptname* ".scm")
+						"-XXXXXX"))
 				(apply path-join components)))))
 
 (define-macro (with-temporary-working-directory . expressions)
diff --git a/tests/migrations/common.scm b/tests/migrations/common.scm
index b1c90aa04..fa8f1295a 100644
--- a/tests/migrations/common.scm
+++ b/tests/migrations/common.scm
@@ -53,7 +53,7 @@
    (untar-armored src-tarball)
    (setenv "GNUPGHOME" (getcwd) #t)
 
-   (catch (fail "Creating socket directory failed (see README):" (car *error*))
+   (catch (log "Warning: Creating socket directory failed:" (car *error*))
 	  (call-popen `(,gpgconf --create-socketdir) ""))
    (test (getcwd))
    (catch (log "Warning: Removing socket directory failed.")
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 64c086d8c..7c8e10a7e 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -446,7 +446,7 @@
     (atexit (lambda ()
 	      (with-home-directory gnupghome
 				   (stop-agent)))))
-  (catch (fail "Creating socket directory failed (see README):" (car *error*))
+  (catch (log "Warning: Creating socket directory failed:" (car *error*))
 	 (call-popen `(,(tool 'gpgconf) --create-socketdir) ""))
   (call-check `(,(tool 'gpg-connect-agent) --verbose
 		,(string-append "--agent-program=" (tool 'gpg-agent)