diff --git a/packaging/Makefile.dist-packaging b/packaging/Makefile.dist-packaging
index a0f0f4bb..a89c3a48 100644
--- a/packaging/Makefile.dist-packaging
+++ b/packaging/Makefile.dist-packaging
@@ -30,3 +30,5 @@ srpm: dist-snapshot
 
 rpm: srpm
 	./rpmbuild-cwd --rebuild $(PKG_VER)*.src.rpm
+	repomanage -o | xargs -r rm
+	createrepo_c .
diff --git a/tests-container/CentOS-Base.repo b/tests-container/CentOS-Base.repo
new file mode 100644
index 00000000..629f3f55
--- /dev/null
+++ b/tests-container/CentOS-Base.repo
@@ -0,0 +1,24 @@
+# CentOS-Base.repo
+#
+# The mirror system uses the connecting IP address of the client and the
+# update status of each mirror to pick mirrors that are updated to and
+# geographically close to the client.  You should use this for CentOS updates
+# unless you are manually picking other mirrors.
+#
+# If the mirrorlist= does not work for you, as a fall back you can try the 
+# remarked out baseurl= line instead.
+#
+#
+
+[base]
+name=CentOS-$releasever - Base
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os&infra=$infra
+#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
+gpgcheck=0
+
+#released updates 
+[updates]
+name=CentOS-$releasever - Updates
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates&infra=$infra
+#baseurl=http://mirror.centos.org/centos/$releasever/updates/$basearch/
+gpgcheck=0
diff --git a/tests-container/Dockerfile b/tests-container/Dockerfile
new file mode 100644
index 00000000..3d44f8f1
--- /dev/null
+++ b/tests-container/Dockerfile
@@ -0,0 +1,9 @@
+FROM centos
+ADD centos-atomic-7.repo /etc/yum.repos.d/centos-atomic-7.repo
+ADD local.repo /etc/yum.repos.d/local.repo
+ADD repo /var/tmp/repo
+ADD pkgblob.tar /var/tmp/centos
+ADD test-centos.json /var/tmp/test/test-centos.json
+ADD test-centos.repo /var/tmp/test/test-centos.repo
+ADD container-build.sh /usr/bin/container-build
+RUN /usr/bin/container-build
diff --git a/tests-container/centos-atomic-7.repo b/tests-container/centos-atomic-7.repo
new file mode 100644
index 00000000..20862a66
--- /dev/null
+++ b/tests-container/centos-atomic-7.repo
@@ -0,0 +1,5 @@
+[centos-atomic7-testing]
+name=centos-atomic7-testing
+baseurl=https://cbs.centos.org/repos/atomic7-testing/x86_64/os/
+enabled=1
+gpgcheck=0
diff --git a/tests-container/container-build.sh b/tests-container/container-build.sh
new file mode 100755
index 00000000..f5b54863
--- /dev/null
+++ b/tests-container/container-build.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -xeuo pipefail
+yum -y install rpm-ostree
+cd /var/tmp
+mkdir -p test
+cd test
+mkdir repo
+ostree --repo=repo init --mode=bare-user
+
diff --git a/tests-container/local.repo b/tests-container/local.repo
new file mode 100644
index 00000000..ea8a25fd
--- /dev/null
+++ b/tests-container/local.repo
@@ -0,0 +1,4 @@
+[local]
+name=local
+baseurl=file:///var/tmp/repo
+gpgcheck=0
diff --git a/tests-container/test-centos.json b/tests-container/test-centos.json
new file mode 100644
index 00000000..ecee9e3a
--- /dev/null
+++ b/tests-container/test-centos.json
@@ -0,0 +1,6 @@
+{
+    "ref": "testos/x86_64/test",
+    "repos": ["test-centos"],
+    "packages": ["kernel", "systemd"],
+    "selinux": true
+}
diff --git a/tests-container/test-centos.repo b/tests-container/test-centos.repo
new file mode 100644
index 00000000..6f27a6b7
--- /dev/null
+++ b/tests-container/test-centos.repo
@@ -0,0 +1,4 @@
+[test-centos]
+name=test-centos
+baseurl=file:///var/tmp/centos/pkgblob
+gpgcheck=0