diff --git a/Makefile b/Makefile
index 1a7d4049..0c4aa1b1 100644
--- a/Makefile
+++ b/Makefile
@@ -65,9 +65,6 @@ install: ${PKGSOURCES}
 	install -d ${DESTDIR}/${MAN8DIR}
 	install -d ${DESTDIR}/usr/share/man/man5
 	install -d ${DESTDIR}/usr/share/${PACKAGE}
-	install -m 0644 pve-usb.cfg ${DESTDIR}/usr/share/${PACKAGE}
-	install -m 0644 pve-q35.cfg ${DESTDIR}/usr/share/${PACKAGE}
-	install -m 0644 pve-q35-4.0.cfg ${DESTDIR}/usr/share/${PACKAGE}
 	install -m 0644 -D qm.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/qm
 	install -m 0644 -D qmrestore.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/qmrestore
 	install -m 0644 -D qm.zsh-completion ${DESTDIR}/${ZSHCOMPLDIR}/_qm
@@ -75,6 +72,7 @@ install: ${PKGSOURCES}
 	install -m 0644 -D bootsplash.jpg ${DESTDIR}/usr/share/${PACKAGE}
 	$(MAKE) -C PVE install
 	$(MAKE) -C qmeventd install
+	$(MAKE) -C qemu-configs install
 	install -m 0755 qm ${DESTDIR}${SBINDIR}
 	install -m 0755 qmrestore ${DESTDIR}${SBINDIR}
 	install -m 0755 pve-bridge ${DESTDIR}${VARLIBDIR}/pve-bridge
diff --git a/qemu-configs/Makefile b/qemu-configs/Makefile
new file mode 100644
index 00000000..f55e9bef
--- /dev/null
+++ b/qemu-configs/Makefile
@@ -0,0 +1,12 @@
+DESTDIR=
+USRSHAREDIR=$(DESTDIR)/usr/share/qemu-server
+
+.PHONY: install
+install: pve-usb.cfg pve-q35.cfg pve-q35-4.0.cfg
+	install -d $(USRSHAREDIR)
+	install -m 0644 pve-usb.cfg $(USRSHAREDIR)
+	install -m 0644 pve-q35.cfg $(USRSHAREDIR)
+	install -m 0644 pve-q35-4.0.cfg $(USRSHAREDIR)
+
+.PHONY: clean
+clean:
diff --git a/pve-q35-4.0.cfg b/qemu-configs/pve-q35-4.0.cfg
similarity index 100%
rename from pve-q35-4.0.cfg
rename to qemu-configs/pve-q35-4.0.cfg
diff --git a/pve-q35.cfg b/qemu-configs/pve-q35.cfg
similarity index 100%
rename from pve-q35.cfg
rename to qemu-configs/pve-q35.cfg
diff --git a/pve-usb.cfg b/qemu-configs/pve-usb.cfg
similarity index 100%
rename from pve-usb.cfg
rename to qemu-configs/pve-usb.cfg
diff --git a/test/run_pci_addr_checks.pl b/test/run_pci_addr_checks.pl
index 602bea58..2ae3579b 100755
--- a/test/run_pci_addr_checks.pl
+++ b/test/run_pci_addr_checks.pl
@@ -11,6 +11,8 @@ use Test::More;
 use PVE::Tools qw(file_get_contents);
 use PVE::QemuServer::PCI;
 
+my $qemu_cfg_base_path = "../qemu-configs";
+
 # not our format but that what QEMU gets passed with '-readconfig'
 sub slurp_qemu_config {
     my ($fn) = @_;
@@ -112,19 +114,19 @@ while (my ($id, $what) = each %$pcie_map) {
     check_conflict($id, $what);
 }
 
-my $pve_qm_cfg = slurp_qemu_config('../pve-q35.cfg');
+my $pve_qm_cfg = slurp_qemu_config("$qemu_cfg_base_path/pve-q35.cfg");
 my $pve_qm_cfg_map = extract_qemu_config_addrs($pve_qm_cfg);
 while (my ($id, $what) = each %$pve_qm_cfg_map) {
     check_conflict($id, $what);
 }
 
 # FIXME: restart with clean conflict $addr_map with only get_pci*_addr_map ones?
-my $pve_qm4_cfg = slurp_qemu_config('../pve-q35-4.0.cfg');
+my $pve_qm4_cfg = slurp_qemu_config("$qemu_cfg_base_path/pve-q35-4.0.cfg");
 my $pve_qm4_cfg_map = extract_qemu_config_addrs($pve_qm4_cfg);
 while (my ($id, $what) = each %$pve_qm4_cfg_map) {
     check_conflict($id, $what, 1);
 }
-my $pve_qm_usb_cfg = slurp_qemu_config('../pve-usb.cfg');
+my $pve_qm_usb_cfg = slurp_qemu_config("$qemu_cfg_base_path/pve-usb.cfg");
 my $pve_qm_usb_cfg_map = extract_qemu_config_addrs($pve_qm_usb_cfg);
 while (my ($id, $what) = each %$pve_qm_usb_cfg_map) {
     check_conflict($id, $what, 1);