diff --git a/common/control_files/barbican-api.initd.supervisord b/common/control_files/barbican-api.initd.supervisord
index 20c0099d5..90f40aee3 100755
--- a/common/control_files/barbican-api.initd.supervisord
+++ b/common/control_files/barbican-api.initd.supervisord
@@ -3,4 +3,8 @@
 # chkconfig: 2345 99 01
 # description: Juniper Network Virtualization API
 
-supervisorctl -s unix:///tmp/supervisord_openstack.sock ${1} `basename ${0}`
+if [ -e /tmp/supervisord_openstack.sock ]; then
+    supervisorctl -s unix:///tmp/supervisord_openstack.sock ${1} `basename ${0}`
+else
+    supervisorctl -s unix:///var/run/supervisord_openstack.sock ${1} `basename ${0}`
+fi
diff --git a/common/control_files/barbican-worker.initd.supervisord b/common/control_files/barbican-worker.initd.supervisord
index 20c0099d5..90f40aee3 100755
--- a/common/control_files/barbican-worker.initd.supervisord
+++ b/common/control_files/barbican-worker.initd.supervisord
@@ -3,4 +3,8 @@
 # chkconfig: 2345 99 01
 # description: Juniper Network Virtualization API
 
-supervisorctl -s unix:///tmp/supervisord_openstack.sock ${1} `basename ${0}`
+if [ -e /tmp/supervisord_openstack.sock ]; then
+    supervisorctl -s unix:///tmp/supervisord_openstack.sock ${1} `basename ${0}`
+else
+    supervisorctl -s unix:///var/run/supervisord_openstack.sock ${1} `basename ${0}`
+fi