diff --git a/tests/libtest.sh b/tests/libtest.sh
index eb4f1c14..db161958 100644
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -180,6 +180,18 @@ assert_file_empty() {
     fi
 }
 
+assert_remote_has_config () {
+    ostree config --repo=$FL_DIR/repo get --group 'remote "'"$1"'"' "$2" > key-output
+    assert_file_has_content key-output "$3"
+}
+
+assert_remote_has_no_config () {
+    if ostree config --repo=$FL_DIR/repo get --group 'remote "'"$1"'"' "$2" > /dev/null; then
+        echo 1>&2 "Remote '$1' unexpectedly has key '$2'"
+        exit 1
+    fi
+}
+
 export FL_GPG_HOMEDIR=${TEST_DATA_DIR}/gpghome
 export FL_GPG_HOMEDIR2=${TEST_DATA_DIR}/gpghome2
 mkdir -p ${FL_GPG_HOMEDIR}
diff --git a/tests/test-repo.sh b/tests/test-repo.sh
index 0a9c6e40..c0db3a92 100644
--- a/tests/test-repo.sh
+++ b/tests/test-repo.sh
@@ -24,7 +24,7 @@ set -euo pipefail
 skip_without_bwrap
 skip_revokefs_without_fuse
 
-echo "1..31"
+echo "1..32"
 
 #Regular repo
 setup_repo
@@ -648,3 +648,77 @@ assert_file_has_content remote-ls-log "runtime/org\.test\.Hello\.Locale"
 assert_file_has_content remote-ls-log "runtime/org\.test\.Platform"
 
 echo "ok filter"
+
+# Try installing it from a flatpakref file. Don’t uninstall afterwards because
+# we need it for the next test.
+cat << EOF > test.flatpakrepo
+[Flatpak Repo]
+Url=http://127.0.0.1:${port}/test-no-gpg
+Title=The Title
+Comment=The Comment
+Description=The Description
+Homepage=https://the.homepage/
+Icon=https://the.icon/
+DefaultBranch=default-branch
+NoDeps=true
+EOF
+
+if ${FLATPAK} ${U} remote-add test-repo test.flatpakrepo; then
+    assert_not_reached "should not be able to add pre-existing remote"
+fi
+
+# No-op
+${FLATPAK} ${U} remote-add --if-not-exists test-repo test.flatpakrepo
+
+
+${FLATPAK} ${U} remote-add new-repo test.flatpakrepo
+
+assert_remote_has_config new-repo url "http://127.0.0.1:${port}/test-no-gpg"
+assert_remote_has_config new-repo gpg-verify "false"
+assert_remote_has_config new-repo xa.title "The Title"
+assert_remote_has_no_config new-repo xa.title-is-set
+assert_remote_has_config new-repo xa.comment "The Comment"
+assert_remote_has_no_config new-repo xa.comment-is-set
+assert_remote_has_config new-repo xa.description "The Description"
+assert_remote_has_no_config new-repo xa.description-is-set
+assert_remote_has_config new-repo xa.homepage "https://the.homepage/"
+assert_remote_has_no_config new-repo xa.homepage-is-set
+assert_remote_has_config new-repo xa.icon "https://the.icon/"
+assert_remote_has_no_config new-repo xa.icon-is-set
+assert_remote_has_config new-repo xa.default-branch "default-branch"
+assert_remote_has_no_config new-repo xa.default-branch-is-set
+assert_remote_has_config new-repo xa.nodeps "true"
+assert_remote_has_no_config new-repo xa.noenumerate
+assert_remote_has_no_config new-repo xa.filter
+
+${FLATPAK} ${U} remote-delete new-repo
+${FLATPAK} ${U} remote-add  --title=Title2 --comment=Comment2 --default-branch=branch2 new-repo test.flatpakrepo
+
+assert_remote_has_config new-repo url "http://127.0.0.1:${port}/test-no-gpg"
+assert_remote_has_config new-repo gpg-verify "false"
+assert_remote_has_config new-repo xa.title "Title2"
+assert_remote_has_config new-repo xa.title-is-set true
+assert_remote_has_config new-repo xa.comment "Comment2"
+assert_remote_has_config new-repo xa.comment-is-set true
+assert_remote_has_config new-repo xa.description "The Description"
+assert_remote_has_no_config new-repo xa.description-is-set
+assert_remote_has_config new-repo xa.homepage "https://the.homepage/"
+assert_remote_has_no_config new-repo xa.homepage-is-set
+assert_remote_has_config new-repo xa.icon "https://the.icon/"
+assert_remote_has_no_config new-repo xa.icon-is-set
+assert_remote_has_config new-repo xa.default-branch "branch2"
+assert_remote_has_config new-repo xa.default-branch-is-set true
+assert_remote_has_config new-repo xa.nodeps "true"
+assert_remote_has_no_config new-repo xa.noenumerate
+assert_remote_has_no_config new-repo xa.filter
+
+${FLATPAK} ${U} remote-delete new-repo
+${FLATPAK} ${U} remote-add  --filter="${test_builddir}/test.filter" new-repo test.flatpakrepo
+
+assert_remote_has_config new-repo xa.filter "${test_builddir}/test.filter"
+
+# This should unset the filter:
+${FLATPAK} ${U} remote-add --if-not-exists new-repo test.flatpakrepo
+assert_remote_has_no_config new-repo xa.filter
+
+echo "ok flatpakrepo"