diff --git a/salt/common/init.sls b/salt/common/init.sls
index e9f5c2dd8..82ac4a062 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -13,6 +13,20 @@ socore:
     - createhome: True
     - shell: /bin/bash
 
+# Create a state directory
+statedir:
+  file.directory:
+    - name: /opt/so/state
+    - user: 939
+    - group: 939
+    - makedirs: True
+
+salttmp:
+  file.directory:
+    - name: /opt/so/tmp
+    - user: 939
+    - group: 939
+    - makedirs: True
 
 # Install packages needed for the sensor
 sensorpkgs:
diff --git a/salt/salt/init.sls b/salt/salt/init.sls
index 22ecddfb3..a11246cbb 100644
--- a/salt/salt/init.sls
+++ b/salt/salt/init.sls
@@ -1,18 +1,4 @@
-# Create a state directory
 
-statedir:
-  file.directory:
-    - name: /opt/so/state
-    - user: 939
-    - group: 939
-    - makedirs: True
-
-salttmp:
-  file.directory:
-    - name: /opt/so/tmp
-    - user: 939
-    - group: 939
-    - makedirs: True
 
 {% if grains['os'] != 'CentOS' %}    
 saltpymodules: