diff --git a/tests/Makefile.am b/tests/Makefile.am
index c9044a4..7712a89 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,46 +1,51 @@
 # Makefile for Assuan regression tests
 # Copyright (C) 2006 Free Software Foundation, Inc.
 #
 # This file is part of Assuan.
 #
 # Assuan is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 3 of
 # the License, or (at your option) any later version.
 #
 # Assuan is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
 TESTS_ENVIRONMENT =
 
 EXTRA_DIST = motd ce-createpipe.c
 
 BUILT_SOURCES =
 CLEANFILES =
 
-testtools = socks5
-
-TESTS = version pipeconnect
+TESTS = version
 
 if HAVE_W32CE_SYSTEM
 w32cetools = ce-createpipe ce-server
 endif
 
+if HAVE_W32_SYSTEM
+testtools =
+else
+TESTS += pipeconnect
+testtools = socks5
+endif
+
 if USE_DESCRIPTOR_PASSING
 TESTS += fdpassing
 endif
 
 AM_CFLAGS = $(GPG_ERROR_CFLAGS)
 AM_LDFLAGS = -no-install
 
 noinst_HEADERS = common.h
 noinst_PROGRAMS = $(TESTS) $(w32cetools) $(testtools)
 LDADD = ../src/libassuan.la  $(NETLIBS) $(GPG_ERROR_LIBS)