diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index bed9a3f..33c0c5c 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -112,6 +112,7 @@
     - file: ovs_port_{{ interface_name }}_line1
     - file: ovs_port_{{ interface_name }}_line2
     - openvswitch_bridge: ovs_bridge_{{ interface.bridge }}
+    - file: linux_interfaces_final_include
 
 {%- endif %}
 
diff --git a/linux/system/user.sls b/linux/system/user.sls
index 5c6ba92..ef01605 100644
--- a/linux/system/user.sls
+++ b/linux/system/user.sls
@@ -1,6 +1,9 @@
 {%- from "linux/map.jinja" import system with context %}
 {%- if system.enabled %}
 
+include:
+  - linux.system.group
+
 {%- for name, user in system.user.iteritems() %}
 
 {%- if user.enabled %}
@@ -12,7 +15,6 @@
   {%- endif %}
 {%- endfor %}
 
-
 system_user_{{ name }}:
   user.present:
   - name: {{ name }}
diff --git a/tests/pillar/system.sls b/tests/pillar/system.sls
index 58358f8..bdb70be 100644
--- a/tests/pillar/system.sls
+++ b/tests/pillar/system.sls
@@ -35,9 +35,9 @@
         enabled: true
         home: /root
         name: root
-      test:
+      testuser:
         enabled: true
-        name: test
+        name: testuser
         sudo: true
         uid: 9999
         full_name: Test User
@@ -62,9 +62,9 @@
         groups:
           - sudogroup1
     group:
-      test:
+      testgroup:
         enabled: true
-        name: test
+        name: testgroup
         gid: 9999
         system: true
       db-ops:
@@ -85,7 +85,7 @@
       test:
         enabled: true
         command: "/bin/sleep 3"
-        user: test
+        user: testuser
         minute: 0
         hour: 13
     package: