diff --git a/ci/build-rpm.sh b/ci/build-rpm.sh
index 1d496dce59..5d09633365 100755
--- a/ci/build-rpm.sh
+++ b/ci/build-rpm.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/bash
-# Install build dependencies, run unit tests and installed tests.
+# Generate a src.rpm, then binary rpms in the current directory
 
 set -xeuo pipefail
 
@@ -26,7 +26,7 @@ if test "${OS_ID}" = 'fedora'; then
     esac
 fi
 case "${CONFIGOPTS:-}" in
-    *--with-curl*|--with-soup*)
+    *--with-curl*|*--with-soup*)
         if test -x /usr/bin/gnome-desktop-testing-runner; then
             CONFIGOPTS="${CONFIGOPTS} --enable-installed-tests=exclusive"
         fi
diff --git a/ci/libpaprci/libbuild.sh b/ci/libpaprci/libbuild.sh
index 2ffe3b73dc..074494f00c 100644
--- a/ci/libpaprci/libbuild.sh
+++ b/ci/libpaprci/libbuild.sh
@@ -26,7 +26,7 @@ make() {
 
 build() {
     env NOCONFIGURE=1 ./autogen.sh
-    ./configure --prefix=/usr --libdir=/usr/lib64 "$@"
+    ./configure --sysconfdir=/etc --prefix=/usr --libdir=/usr/lib64 "$@"
     make V=1
 }
 
diff --git a/tests/fedora-str/overlay-git.yml b/tests/fedora-str/overlay-git.yml
index 112c1b15ad..41d128463e 100644
--- a/tests/fedora-str/overlay-git.yml
+++ b/tests/fedora-str/overlay-git.yml
@@ -4,36 +4,27 @@
   - atomic
   remote_user: root
   tasks:
-  # Install the built RPM to the VM
-  - command: git rev-parse HEAD
-    register: git_rev_head
-    connection: local
+  - command: ostree --version
+    changed_when: False
+    register: ostree_orig_version
+  - set_fact:
+      ostree_orig_version_yaml: "{{ ostree_orig_version.stdout | from_yaml }}"
   - name: Copy locally built RPMs
     synchronize: src=x86_64/ dest=/root/x86_64/ archive=yes
   - shell: ostree admin unlock || true
-    changed_when: False
   # Install the RPMs we already have.  For the test suite we use rpm2cpio
   # since it depends on libsoup, but we're not using that yet for the sysinstalled tests
   - shell: >
       /usr/bin/rpm -Fvh /root/x86_64/*.rpm && \
       cd / && rpm2cpio /root/x86_64/ostree-tests-2*.rpm | cpio -div
-    changed_when: False
-  - shell: /usr/bin/rpm -Fvh /root/x86_64/*.rpm
-    changed_when: False
   - command: ostree --version
-    changed_when: False
-    register: ostree_version
+    register: ostree_new_version
   - set_fact:
-      ostree_version_yaml: "{{ ostree_version.stdout | from_yaml }}"
-  # FIXME: make this work when building RPMs too
-  # - name: Fail if current git is not equal to installed
-  #   when: git_rev_head.stdout != ostree_version_yaml['libostree']['Git']
-  #   fail:
-  #     msg: |
-  #       "Git rev mismatch:
-  #         HEAD={{ git_rev_head.stdout }}
-  #         binary={{ ostree_version_yaml['libostree']['Git'] }}"
-  # - debug: msg="{{ ostree_version.stdout | from_yaml }}"
+      ostree_new_version_yaml: "{{ ostree_new_version.stdout | from_yaml }}"
+  - name: "Fail if we didn't change the ostree version"
+    when: ostree_orig_version_yaml['libostree']['Git'] == ostree_new_version_yaml['libostree']['Git']
+    fail:
+      msg: "Failed to change ostree version"
 
   # Next copy all of the tests/ directory
   - name: Copy test data
diff --git a/tests/fedora-str/sysinstall-tests.yml b/tests/fedora-str/sysinstall-tests.yml
index b6a9a62d38..366a7a5779 100644
--- a/tests/fedora-str/sysinstall-tests.yml
+++ b/tests/fedora-str/sysinstall-tests.yml
@@ -4,10 +4,7 @@
   - atomic
   remote_user: root
   tasks:
-  - find:
-      paths: /root/tests/installed/
-      patterns: "itest-*.sh"
-    register: installed_tests
+  # Down the line perhaps do each log file separately?
   - name: Run sysinstalled tests
     shell: /root/tests/installed/run.sh &> /root/installed-tests.log
     register: sysinstalled_result
diff --git a/tests/installed/fah-prep.sh b/tests/installed/fah-prep.sh
deleted file mode 100755
index 865fa4f120..0000000000
--- a/tests/installed/fah-prep.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -xeuo pipefail
-# If we're using devmapper, expand the root
-if lvm lvs atomicos/docker-pool &>/dev/null; then
-    systemctl stop docker
-    lvm lvremove -f atomicos/docker-pool
-fi
-lvm lvextend -r -l +100%FREE atomicos/root
-ostree admin unlock
-rsync -rlv ./ostree/insttree/usr/ /usr/