diff --git a/tests/Makefile-test-matrix.am.inc b/tests/Makefile-test-matrix.am.inc
index 02be8c8e..fde7aafc 100644
--- a/tests/Makefile-test-matrix.am.inc
+++ b/tests/Makefile-test-matrix.am.inc
@@ -35,6 +35,7 @@ TEST_MATRIX_DIST= \
 	tests/test-config.sh \
 	tests/test-build-update-repo.sh \
 	tests/test-http-utils.sh \
+	tests/test-history.sh \
 	tests/test-default-remotes.sh \
 	tests/test-metadata-validation.sh \
 	tests/test-extensions.sh \
diff --git a/tests/Makefile.am.inc b/tests/Makefile.am.inc
index 68d0afde..91a5b6b9 100644
--- a/tests/Makefile.am.inc
+++ b/tests/Makefile.am.inc
@@ -266,6 +266,7 @@ TEST_MATRIX_SOURCE = \
 	tests/test-run.sh{{user+system+system-norevokefs},{nodeltas+deltas}} \
 	tests/test-info.sh{user+system} \
 	tests/test-repo.sh{{user+system+system-norevokefs}+{{user+system},oldsummary}} \
+	tests/test-history.sh \
 	tests/test-sideload.sh{user+system} \
 	tests/test-default-remotes.sh \
 	tests/test-metadata-validation.sh \
diff --git a/tests/test-history.sh b/tests/test-history.sh
new file mode 100755
index 00000000..78fbf8ba
--- /dev/null
+++ b/tests/test-history.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+# Copyright (C) 2021 Matthew Leeds <mwleeds@protonmail.com>
+# SPDX-License-Identifier: LGPL-2.0-or-later
+
+set -euo pipefail
+
+USE_SYSTEMDIR=yes
+
+. $(dirname $0)/libtest.sh
+
+skip_without_bwrap
+skip_revokefs_without_fuse
+
+echo "1..1"
+
+sleep 1
+HISTORY_START_TIME=$(date +"%Y-%m-%d %H:%M:%S")
+
+mkdir -p ${TEST_DATA_DIR}/system-history-installation
+mkdir -p ${FLATPAK_CONFIG_DIR}/installations.d
+cat << EOF > ${FLATPAK_CONFIG_DIR}/installations.d/history-installation.conf
+[Installation "history-installation"]
+Path=${TEST_DATA_DIR}/system-history-installation
+EOF
+
+# setup repo and install from it
+setup_repo_no_add
+port=$(cat httpd-port)
+${FLATPAK} --installation=history-installation remote-add \
+    --gpg-import=${FL_GPG_HOMEDIR}/pubring.gpg test-repo "http://127.0.0.1:${port}/test"
+${FLATPAK} --installation=history-installation install -y test-repo org.test.Hello master
+
+# appstream update shouldn't show up in history
+${FLATPAK} ${U} --appstream update test-repo
+
+# update, uninstall, and remote-delete should show up
+EXPORT_ARGS="" make_updated_app
+${FLATPAK} --installation=history-installation update -y org.test.Hello
+${FLATPAK} --installation=history-installation uninstall -y org.test.Platform org.test.Hello
+${FLATPAK} --installation=history-installation remote-delete test-repo
+
+# need --since and --columns here to make the test idempotent
+${FLATPAK} --installation=history-installation history --since="${HISTORY_START_TIME}" \
+    --columns=change,application,branch,installation,remote > history-log 2>&1
+
+diff history-log - << EOF
+add remote			system (history-installation)	test-repo
+deploy install	org.test.Hello.Locale	master	system (history-installation)	test-repo
+deploy install	org.test.Platform	master	system (history-installation)	test-repo
+deploy install	org.test.Hello	master	system (history-installation)	test-repo
+deploy update	org.test.Hello.Locale	master	system (history-installation)	test-repo
+deploy update	org.test.Hello	master	system (history-installation)	test-repo
+uninstall	org.test.Hello	master	system (history-installation)
+uninstall	org.test.Platform	master	system (history-installation)
+uninstall	org.test.Hello.Locale	master	system (history-installation)
+remove remote			system (history-installation)	test-repo
+EOF
+
+rm -f ${FLATPAK_CONFIG_DIR}/installations.d/history-inst.conf
+rm -rf ${TEST_DATA_DIR}/system-history-installation
+
+ok "history looks correct"