diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index 7b53cb14..76f39cad 100644
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -143,13 +143,12 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c
 endif
 
 if USE_LIBSOUP
-if BUILDOPT_TRIVIAL_HTTPD
+# Eventually once we stop things from using this, we should support disabling this
 ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c
 pkglibexec_PROGRAMS += ostree-trivial-httpd
 ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c
 ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS)
 ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS)
-endif
 
 if !USE_CURL
 # This is necessary for the cookie jar bits
diff --git a/Makefile.am b/Makefile.am
index 673dbf88..cd04a055 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS += \
 	--enable-gtk-doc \
 	--enable-man \
 	--disable-maintainer-mode \
-	--enable-trivial-httpd-cmdline \
 	$(NULL)
 
 GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make
diff --git a/ci/build.sh b/ci/build.sh
index 806af050..09015074 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -22,11 +22,6 @@ case "${CONFIGOPTS:-}" in
         fi
         ;;
 esac
-# unless libsoup is disabled, enable trivial-httpd for the tests
-case "${CONFIGOPTS:-}" in
-    *--without-soup*) ;;
-    *) CONFIGOPTS="${CONFIGOPTS:-} --enable-trivial-httpd-cmdline" ;;
-esac
 
 # always fail on warnings; https://github.com/ostreedev/ostree/pull/971
 # NB: this disables the default set of flags from configure.ac
diff --git a/ci/travis-build.sh b/ci/travis-build.sh
index 7c85313a..3fd969bd 100755
--- a/ci/travis-build.sh
+++ b/ci/travis-build.sh
@@ -85,7 +85,6 @@ make="make -j${ci_parallel} V=1 VERBOSE=1"
 
 ../configure \
     --enable-always-build-tests \
-    --enable-trivial-httpd-cmdline \
     ${ci_configopts}
     "$@"
 
diff --git a/configure.ac b/configure.ac
index e009d6b2..6861afb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,9 +195,6 @@ AC_ARG_ENABLE(trivial-httpd-cmdline,
   [Continue to support "ostree trivial-httpd" [default=no]])],,
   enable_trivial_httpd_cmdline=no)
 AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes)
-AS_IF([test x$with_soup = xno && test x$enable_trivial_httpd_cmdline = xyes], [
-  AC_MSG_ERROR([trivial-httpd enabled, but libsoup is not; libsoup is needed for trivial-httpd])
-])
 AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD,
   [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])]
 )