diff --git a/configure.ac b/configure.ac
index 01ea237..5450455 100644
--- a/configure.ac
+++ b/configure.ac
@@ -714,7 +714,7 @@ AS_IF([test "X$enable_pcre" != "Xno"],[

 dnl Needed by src/Makefile.am
 AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
-
+AM_CONDITIONAL([WITH_SSL], [test "X$with_ssl" != "Xno"])

 dnl
 dnl Create output
diff --git a/testenv/Makefile.am b/testenv/Makefile.am
index 1058421..6cd84c8 100644
--- a/testenv/Makefile.am
+++ b/testenv/Makefile.am
@@ -29,6 +29,8 @@
 AUTOMAKE_OPTIONS = parallel-tests
 AM_TESTS_ENVIRONMENT = export WGETRC=/dev/null; MAKE_CHECK=True; export MAKE_CHECK;\
  export PYTHONPATH=$$PYTHONPATH:$(srcdir); export VALGRIND_TESTS="@VALGRIND_TESTS@";
+
+SSL_TESTS = Test--https.py Test--https-crl.py
 if HAVE_PYTHON3
   TESTS = Test-auth-basic-fail.py                   \
     Test-auth-basic.py                              \
@@ -47,21 +49,23 @@ if HAVE_PYTHON3
     Test-cookie-expires.py                          \
     Test-cookie.py                                  \
     Test-Head.py                                    \
-    Test--https.py                                  \
-    Test--https-crl.py                              \
     Test-O.py                                       \
     Test-Post.py                                    \
     Test-504.py                                     \
     Test--spider-r.py                               \
     Test-redirect-crash.py                          \
     Test-reserved-chars.py                          \
-    Test-condget.py
+    Test-condget.py                                 \
+    $(SSL_TESTS)

   # added test cases expected to fail here and under TESTS
-  XFAIL_TESTS +if !WITH_SSL
+  XFAIL_TESTS = $(SSL_TESTS)
+endif
+
 endif

-EXTRA_DIST = certs conf exc misc server test README $(TESTS) $(XFAIL_TESTS)
+EXTRA_DIST = certs conf exc misc server test README $(TESTS)

 TEST_EXTENSIONS = .py
 PY_LOG_COMPILER = python3