diff --git a/Makefile-tests.am b/Makefile-tests.am
index 25a8d08b..9198eb31 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -381,6 +381,14 @@ dist_test_scripts += $(_installed_or_uninstalled_test_scripts)
 test_programs += $(_installed_or_uninstalled_test_programs)
 endif
 
+if !USE_LIBSOUP
+no-soup-for-you-warning:
+	@echo "WARNING: $(PACKAGE) was built without libsoup, which is currently" 1>&2
+	@echo "WARNING: required for many unit tests." 1>&2
+	sleep 10
+check: no-soup-for-you-warning
+endif
+
 # Unfortunately the glib test data APIs don't actually handle
 # non-recursive Automake, so we change our code to canonically look
 # for tests/ which is just a symlink when installed.
diff --git a/configure.ac b/configure.ac
index fa436ea6..e26c903c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,7 +197,7 @@ AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD,
 )
 
 AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [
-  AC_MSG_ERROR([Curl enabled, but libsoup is not; libsoup is needed for tests])
+  AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)])
 ])
 AM_CONDITIONAL(USE_CURL_OR_SOUP, test x$with_curl != xno || test x$with_soup != xno)
 AS_IF([test x$with_curl != xno || test x$with_soup != xno],