diff --git a/Makefile-decls.am b/Makefile-decls.am
index df635706..e41586d1 100644
--- a/Makefile-decls.am
+++ b/Makefile-decls.am
@@ -46,6 +46,9 @@ gsettings_SCHEMAS =
 ostree_bootdir = $(prefix)/lib/ostree
 ostree_boot_PROGRAMS =
 
+# This initializes some more variables
+include $(top_srcdir)/buildutil/glib-tap.mk
+
 # This is a special facility to chain together hooks easily
 INSTALL_DATA_HOOKS =
 install-data-hook: $(INSTALL_DATA_HOOKS)
diff --git a/Makefile-switchroot.am b/Makefile-switchroot.am
index 0b30a965..6fd2f820 100644
--- a/Makefile-switchroot.am
+++ b/Makefile-switchroot.am
@@ -17,6 +17,10 @@
 
 if BUILDOPT_SYSTEMD
 ostree_boot_PROGRAMS += ostree-remount
+else
+# It is built anyway as a side-effect of having the symlink in tests/,
+# and if we declare it here, it gets cleaned up properly
+check_PROGRAMS += ostree-remount
 endif
 
 ostree_prepare_root_SOURCES = \
diff --git a/Makefile-tests.am b/Makefile-tests.am
index 2160cd55..03e50b9b 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -17,8 +17,6 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-include $(top_srcdir)/buildutil/glib-tap.mk
-
 EXTRA_DIST += \
 	buildutil/tap-driver.sh \
 	buildutil/tap-test \