diff --git a/install/ofono.service b/install/ofono.service
deleted file mode 100644
index 0aa9fbed..00000000
--- a/install/ofono.service
+++ /dev/null
@@ -1,11 +0,0 @@
-# systemd service file for the ofono daemon
-[Unit]
-Description=oFono
-
-[Service]
-ExecStart=/usr/local/src/ofono/src/ofonod -n
-Restart=always
-StartLimitInterval=0
-
-[Install]
-WantedBy=multi-user.target
diff --git a/install/org.ofono.conf b/install/org.ofono.conf
deleted file mode 100644
index 8b13c754..00000000
--- a/install/org.ofono.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- This configuration file specifies the required security policies
-     for oFono core daemon to work. It lives in /etc/dbus-1/system.d/ -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
-  <!-- ../system.conf have denied everything, so we just punch some holes -->
-
-  <policy user="root">
-    <allow own="org.ofono"/>
-    <allow send_destination="org.ofono"/>
-    <allow send_interface="org.ofono.SimToolkitAgent"/>
-    <allow send_interface="org.ofono.PushNotificationAgent"/>
-    <allow send_interface="org.ofono.SmartMessagingAgent"/>
-    <allow send_interface="org.ofono.PositioningRequestAgent"/>
-    <allow send_interface="org.ofono.HandsfreeAudioAgent"/>
-  </policy>
-
-  <policy at_console="true">
-    <allow send_destination="org.ofono"/>
-  </policy>
-
-  <policy context="default">
-    <deny send_destination="org.ofono"/>
-  </policy>
-
-</busconfig>
diff --git a/install/osmo-gsm-tester-limits.conf b/install/osmo-gsm-tester-limits.conf
deleted file mode 100644
index 1fb0738e..00000000
--- a/install/osmo-gsm-tester-limits.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# place this file in /etc/security/limits.d to allow core files when a program
-# crashes; for osmo-gsm-tester.
-root	-	core	unlimited
-*	-	core	unlimited
diff --git a/utils/dbus-1/dbus_osmo-gsm-tester.conf b/utils/dbus-1/dbus_osmo-gsm-tester.conf
new file mode 100644
index 00000000..d867833b
--- /dev/null
+++ b/utils/dbus-1/dbus_osmo-gsm-tester.conf
@@ -0,0 +1,9 @@
+<!-- Additional rules for the osmo-gsm-tester to access org.ofono from user
+land -->
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+<policy group="osmo-gsm-tester">
+<allow send_destination="org.ofono"/>
+</policy>
+</busconfig>
diff --git a/install/osmo-gsm-tester.service b/utils/systemd/osmo-gsm-tester.service
similarity index 100%
rename from install/osmo-gsm-tester.service
rename to utils/systemd/osmo-gsm-tester.service