diff --git a/common/Makefile.am b/common/Makefile.am
index d8368fc22..f3fb60f2d 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -170,11 +170,10 @@ module_tests = t-stringhelp t-timestuff \
 	       t-session-env t-openpgp-oid t-ssh-utils \
 	       t-mapstrings t-zb32 t-mbox-util t-iobuf t-strlist \
 	       t-name-value t-ccparray t-recsel t-w32-cmdline
-if !HAVE_W32CE_SYSTEM
-module_tests += t-exechelp t-exectool
-endif
 if HAVE_W32_SYSTEM
 module_tests += t-w32-reg
+else
+module_tests += t-exechelp t-exectool
 endif
 
 if MAINTAINER_MODE
diff --git a/common/t-stringhelp.c b/common/t-stringhelp.c
index 8d0c1c576..4086f8c3d 100644
--- a/common/t-stringhelp.c
+++ b/common/t-stringhelp.c
@@ -88,7 +88,15 @@ mygetcwd (void)
       return buffer;
 #else
       if (getcwd (buffer, size) == buffer)
-        return buffer;
+        {
+#ifdef HAVE_W32_SYSTEM
+          char *p;
+          for (p = buffer; *p; p++)
+            if (*p == '\\')
+              *p = '/';
+#endif
+          return buffer;
+        }
       xfree (buffer);
       if (errno != ERANGE)
         {
diff --git a/tests/cms/Makefile.am b/tests/cms/Makefile.am
index 8e8c2e000..24ce985a5 100644
--- a/tests/cms/Makefile.am
+++ b/tests/cms/Makefile.am
@@ -61,7 +61,7 @@ check: xcheck
 
 .PHONY: xcheck
 xcheck:
-	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \
+	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
 	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
 
 KEYS =	32100C27173EF6E9C4E9A25D3D69F86D37A4F939
diff --git a/tests/gpgme/Makefile.am b/tests/gpgme/Makefile.am
index fc1cfc328..489ecea09 100644
--- a/tests/gpgme/Makefile.am
+++ b/tests/gpgme/Makefile.am
@@ -46,7 +46,7 @@ check: xcheck
 
 .PHONY: xcheck
 xcheck:
-	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \
+	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
 	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
 
 EXTRA_DIST = gpgme-defs.scm run-tests.scm setup.scm wrap.scm all-tests.scm
diff --git a/tests/migrations/Makefile.am b/tests/migrations/Makefile.am
index f38d26e19..90aab3a51 100644
--- a/tests/migrations/Makefile.am
+++ b/tests/migrations/Makefile.am
@@ -54,7 +54,7 @@ check: xcheck
 
 .PHONY: xcheck
 xcheck:
-	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \
+	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
 	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
 
 EXTRA_DIST = common.scm run-tests.scm setup.scm all-tests.scm \
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 3d0cc9db9..be3e350fc 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -114,7 +114,7 @@ check: xcheck
 
 .PHONY: xcheck
 xcheck:
-	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm \
+	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
 	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
 
 TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \