diff --git a/tests/libtest.sh b/tests/libtest.sh
index cfe3c672d6..21fdc64292 100755
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -183,7 +183,7 @@ fi
 if test -z "${OSTREE_HTTPD:-}"; then
     OSTREE_HTTPD="${test_builddir}/ostree-trivial-httpd"
     if ! [ -x "${OSTREE_HTTPD}" ]; then
-        fatal "Failed to find ${OSTREE_HTTPD}"
+        OSTREE_HTTPD=
     fi
 fi
 
diff --git a/tests/test-admin-gpg.sh b/tests/test-admin-gpg.sh
index dcf075c1e1..f71c306b93 100755
--- a/tests/test-admin-gpg.sh
+++ b/tests/test-admin-gpg.sh
@@ -21,6 +21,11 @@ set -euo pipefail
 
 . $(dirname $0)/libtest.sh
 
+if test -z "${OSTREE_HTTPD}"; then
+    echo "1..0 #SKIP no ostree-trivial-httpd"
+    exit 0
+fi
+
 setup_os_repository_signed () {
     mode=$1
     shift
diff --git a/tests/test-commit-sign.sh b/tests/test-commit-sign.sh
index 2aad1cff55..e0cea0b588 100755
--- a/tests/test-commit-sign.sh
+++ b/tests/test-commit-sign.sh
@@ -26,6 +26,11 @@ if ! has_gpgme; then
     exit 0
 fi
 
+if test -z "${OSTREE_HTTPD}"; then
+    echo "1..0 #SKIP no ostree-trivial-httpd"
+    exit 0
+fi
+
 echo "1..7"
 
 keyid="472CDAFA"
diff --git a/tests/test-pull-contenturl.sh b/tests/test-pull-contenturl.sh
index ba6a2a5f67..d47fdfe110 100755
--- a/tests/test-pull-contenturl.sh
+++ b/tests/test-pull-contenturl.sh
@@ -21,6 +21,11 @@ set -euo pipefail
 
 . $(dirname $0)/libtest.sh
 
+if test -z "${OSTREE_HTTPD}"; then
+    echo "1..0 #SKIP no ostree-trivial-httpd"
+    exit 0
+fi
+
 echo "1..2"
 
 COMMIT_SIGN=""
diff --git a/tests/test-pull-metalink.sh b/tests/test-pull-metalink.sh
index f73992b447..22e5d59c91 100755
--- a/tests/test-pull-metalink.sh
+++ b/tests/test-pull-metalink.sh
@@ -21,6 +21,11 @@ set -euo pipefail
 
 . $(dirname $0)/libtest.sh
 
+if test -z "${OSTREE_HTTPD}"; then
+    echo "1..0 #SKIP no ostree-trivial-httpd"
+    exit 0
+fi
+
 setup_fake_remote_repo1 "archive"
 
 echo '1..9'
diff --git a/tests/test-pull-mirrorlist.sh b/tests/test-pull-mirrorlist.sh
index 1d0d2c58ed..d04d1e48d9 100755
--- a/tests/test-pull-mirrorlist.sh
+++ b/tests/test-pull-mirrorlist.sh
@@ -21,6 +21,11 @@ set -euo pipefail
 
 . $(dirname $0)/libtest.sh
 
+if test -z "${OSTREE_HTTPD}"; then
+    echo "1..0 #SKIP no ostree-trivial-httpd"
+    exit 0
+fi
+
 echo "1..3"
 
 setup_fake_remote_repo1 "archive"
diff --git a/tests/test-pull-override-url.sh b/tests/test-pull-override-url.sh
index 71a32714a7..4e8ed03538 100755
--- a/tests/test-pull-override-url.sh
+++ b/tests/test-pull-override-url.sh
@@ -21,6 +21,11 @@ set -euo pipefail
 
 . $(dirname $0)/libtest.sh
 
+if test -z "${OSTREE_HTTPD}"; then
+    echo "1..0 #SKIP no ostree-trivial-httpd"
+    exit 0
+fi
+
 setup_fake_remote_repo1 "archive"
 
 echo '1..1'