diff --git a/configure.ac b/configure.ac
index 59261e8b..34c51639 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,15 @@ AC_MSG_CHECKING([whether to enable VTY/CTRL tests])
 AC_MSG_RESULT([$enable_ext_tests])
 AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")
 
+# mslookup_client_mdns_test (OS#4385: does not work everywhere)
+AC_ARG_ENABLE([mslookup_client_mdns_test],
+		AC_HELP_STRING([--enable-mslookup-client-mdns-test],
+				[Include the mslookup_client_mdns_test in make check [default=no]]),
+		[enable_mslookup_client_mdns_test="$enableval"],[enable_mslookup_client_mdns_test="no"])
+AC_MSG_CHECKING([whether to enable mslookup_client_mdns_test])
+AC_MSG_RESULT([$enable_mslookup_client_mdns_test])
+AM_CONDITIONAL(ENABLE_MSLOOKUP_CLIENT_MDNS_TEST, test "x$enable_mslookup_client_mdns_test" = "xyes")
+
 # Generate manuals
 AC_ARG_ENABLE(manuals,
 	[AS_HELP_STRING(
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 59141823..522d72e0 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -49,7 +49,12 @@ set -x
 
 cd "$base"
 autoreconf --install --force
-./configure --enable-sanitize --enable-external-tests --enable-werror $CONFIG
+./configure \
+	--enable-sanitize \
+	--enable-external-tests \
+	--enable-mslookup-client-mdns-test \
+	--enable-werror \
+	$CONFIG
 $MAKE $PARALLEL_MAKE
 $MAKE check || cat-testlogs.sh
 DISTCHECK_CONFIGURE_FLAGS="$CONFIG" $MAKE distcheck || cat-testlogs.sh
diff --git a/tests/mslookup/Makefile.am b/tests/mslookup/Makefile.am
index ebf2addb..04778e84 100644
--- a/tests/mslookup/Makefile.am
+++ b/tests/mslookup/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_DIST = \
 
 check_PROGRAMS = \
 	mdns_test \
-	mslookup_client_mdns_test \
 	mslookup_client_test \
 	mslookup_test \
 	$(NULL)
@@ -45,14 +44,6 @@ mslookup_client_test_LDADD = \
 	$(LIBOSMOGSM_LIBS) \
 	$(NULL)
 
-mslookup_client_mdns_test_SOURCES = \
-	mslookup_client_mdns_test.c \
-	$(NULL)
-mslookup_client_mdns_test_LDADD = \
-	$(top_builddir)/src/mslookup/libosmo-mslookup.la \
-	$(LIBOSMOGSM_LIBS) \
-	$(NULL)
-
 mdns_test_SOURCES = \
 	mdns_test.c \
 	$(NULL)
@@ -61,6 +52,18 @@ mdns_test_LDADD = \
 	$(LIBOSMOGSM_LIBS) \
 	$(NULL)
 
+if ENABLE_MSLOOKUP_CLIENT_MDNS_TEST
+check_PROGRAMS += mslookup_client_mdns_test
+
+mslookup_client_mdns_test_SOURCES = \
+	mslookup_client_mdns_test.c \
+	$(NULL)
+mslookup_client_mdns_test_LDADD = \
+	$(top_builddir)/src/mslookup/libosmo-mslookup.la \
+	$(LIBOSMOGSM_LIBS) \
+	$(NULL)
+endif
+
 .PHONY: update_exp
 update_exp:
 	for i in $(check_PROGRAMS); do \
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 827e9f81..d30b5e94 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -58,7 +58,9 @@ cat $abs_srcdir/mslookup/mslookup_client_test.err > experr
 AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_test], [0], [ignore], [experr])
 AT_CLEANUP
 
+# AT_SKIP_IF: disable without --enable-mslookup-client-mdns-test (OS#4385)
 AT_SETUP([mslookup_client_mdns])
+AT_SKIP_IF([! test -e $abs_top_builddir/tests/mslookup/mslookup_client_mdns_test ])
 AT_KEYWORDS([mslookup_client_mdns])
 cat $abs_srcdir/mslookup/mslookup_client_mdns_test.err > experr
 AT_CHECK([$abs_top_builddir/tests/mslookup/mslookup_client_mdns_test], [0], [ignore], [experr])