diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index db669b1c..9a3fe2bb 100644
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -25,6 +25,7 @@ libostreeincludedir = $(includedir)/ostree-1
 libostreeinclude_HEADERS = $(libostree_public_headers)
 
 libostree_1_la_SOURCES = \
+	src/libostree/ostree-core-private.h \
 	src/libostree/ostree-core.c \
 	src/libostree/ostree-checksum-input-stream.c \
 	src/libostree/ostree-checksum-input-stream.h \
@@ -109,5 +110,6 @@ libostree_1_la_LIBADD += $(GPGME_LIBS)
 
 gpgreadme_DATA = src/libostree/README-gpg
 gpgreadmedir = $(pkgdatadir)
+EXTRA_DIST += src/libostree/README-gpg
 endif
 
diff --git a/Makefile-tests.am b/Makefile-tests.am
index d9c5991f..ef757712 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -72,10 +72,7 @@ gpginsttest_DATA = tests/gpghome/secring.gpg \
 	 echo 'Type=session' >> $@.tmp; \
 	 mv $@.tmp $@)
 
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)
-testmeta_DATA = $(testfiles:=.test)
-
-insttest_PROGRAMS = test-varint
+insttest_PROGRAMS += test-varint
 test_varint_SOURCES = src/libostree/ostree-varint.c tests/test-varint.c
 test_varint_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
 test_varint_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)