diff --git a/FTLtest.sh b/FTLtest.sh
index 0a3efa43..b8a78b86 100755
--- a/FTLtest.sh
+++ b/FTLtest.sh
@@ -10,7 +10,7 @@
 
 function GetFTLData {
     # Open connection to FTL
-    exec 3<>/dev/tcp/localhost/"$(cat /var/run/pihole-FTL.port)"
+    exec 3<>/dev/tcp/localhost/"$(cat /run/pihole-FTL.port)"
 
     # Test if connection is open
     if { true >&3; } 2> /dev/null; then
diff --git a/src/config.c b/src/config.c
index 2ae1cd14..8276c99b 100644
--- a/src/config.c
+++ b/src/config.c
@@ -302,13 +302,13 @@ void read_FTLconf(void)
 		logg("   DBIMPORT: Not importing history from database");
 
 	// PIDFILE
-	getpath(fp, "PIDFILE", "/var/run/pihole-FTL.pid", &FTLfiles.pid);
+	getpath(fp, "PIDFILE", "/run/pihole-FTL.pid", &FTLfiles.pid);
 
 	// PORTFILE
-	getpath(fp, "PORTFILE", "/var/run/pihole-FTL.port", &FTLfiles.port);
+	getpath(fp, "PORTFILE", "/run/pihole-FTL.port", &FTLfiles.port);
 
 	// SOCKETFILE
-	getpath(fp, "SOCKETFILE", "/var/run/pihole/FTL.sock", &FTLfiles.socketfile);
+	getpath(fp, "SOCKETFILE", "/run/pihole/FTL.sock", &FTLfiles.socketfile);
 
 	// SETUPVARSFILE
 	getpath(fp, "SETUPVARSFILE", "/etc/pihole/setupVars.conf", &FTLfiles.setupVars);
diff --git a/test/run.sh b/test/run.sh
index 6d8fc2b3..bf64b9f5 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -15,9 +15,9 @@ fi
 rm -f /etc/pihole/gravity.db /etc/pihole/pihole-FTL.db /var/log/pihole.log /var/log/pihole-FTL.log
 
 # Create necessary directories and files
-mkdir -p /etc/pihole /var/run/pihole /var/log
-touch /var/log/pihole-FTL.log /var/log/pihole.log /var/run/pihole-FTL.pid /var/run/pihole-FTL.port
-chown pihole:pihole /etc/pihole /var/run/pihole /var/log/pihole.log /var/log/pihole-FTL.log /var/run/pihole-FTL.pid /var/run/pihole-FTL.port
+mkdir -p /etc/pihole /run/pihole /var/log
+touch /var/log/pihole-FTL.log /var/log/pihole.log /run/pihole-FTL.pid /run/pihole-FTL.port
+chown pihole:pihole /etc/pihole /run/pihole /var/log/pihole.log /var/log/pihole-FTL.log /run/pihole-FTL.pid /run/pihole-FTL.port
 
 # Copy binary into a location the new user pihole can access
 cp ./pihole-FTL /home/pihole
diff --git a/tools/socket_client.c b/tools/socket_client.c
index 96434dac..311fb0e6 100644
--- a/tools/socket_client.c
+++ b/tools/socket_client.c
@@ -40,7 +40,7 @@ int main (int argc, char **argv) {
 	address.sun_family = AF_LOCAL;
 
 	char *command = ">stats";
-	strcpy(address.sun_path,"/var/run/pihole/FTL.sock");
+	strcpy(address.sun_path,"/run/pihole/FTL.sock");
 
 	int i;
 	for(i = 1; i < argc; i++) {