diff --git a/tests/pillar/client.sls b/tests/pillar/client.sls
new file mode 100644
index 0000000..80d3739
--- /dev/null
+++ b/tests/pillar/client.sls
@@ -0,0 +1,52 @@
+docker:
+  client:
+    enabled: true
+    images:
+      - jenkins:2.7.1
+      - djangoapp:latest
+      - postgres:latest
+    compose:
+      source:
+        engine: pip
+      django_web:
+        # Run up action, any positional argument to docker-compose CLI
+        # If not defined, only docker-compose.yml is generated
+        status: up
+        environment:
+          SOMEVAR: somevalue
+        service:
+          db:
+            image: postgres
+          web:
+            image: djangoapp
+            volumes:
+              - /srv/volumes/django:/srv/django
+            ports:
+              - 8000:8000
+            depends_on:
+              - db
+    container:
+      jenkins:
+        start: false
+        restart: unless-stopped
+        image: jenkins:2.7.1
+        ports:
+          - 8081:8080
+          - 50000:50000
+        environment:
+          JAVA_OPTS: "-Dhudson.footerURL=https://www.example.com"
+        volumes:
+          - /srv/volumes/jenkins:/var/jenkins_home
+    stack:
+       nginx:
+        enabled: true
+        environment:
+          SOMEVAR: somevalue
+        version: 3.3
+        service:
+          nginx:
+            image: nginx
+            volumes:
+              - /srv/volumes/nginx:/srv/nginx
+            ports:
+              - 80:80
diff --git a/tests/pillar/client_compose.sls b/tests/pillar/client_compose_pip.sls
similarity index 100%
rename from tests/pillar/client_compose.sls
rename to tests/pillar/client_compose_pip.sls
diff --git a/tests/pillar/client_compose_pkg.sls b/tests/pillar/client_compose_pkg.sls
new file mode 100644
index 0000000..f19cffe
--- /dev/null
+++ b/tests/pillar/client_compose_pkg.sls
@@ -0,0 +1,24 @@
+
+docker:
+  client:
+    enabled: true
+    compose:
+      source:
+        engine: pkg
+      django_web:
+        # Run up action, any positional argument to docker-compose CLI
+        # If not defined, only docker-compose.yml is generated
+        status: up
+        environment:
+          SOMEVAR: somevalue
+        service:
+          db:
+            image: postgres
+          web:
+            image: djangoapp
+            volumes:
+              - /srv/volumes/django:/srv/django
+            ports:
+              - 8000:8000
+            depends_on:
+              - db
diff --git a/tests/pillar/client_container.sls b/tests/pillar/client_container.sls
index 917ed2b..ad80a2e 100644
--- a/tests/pillar/client_container.sls
+++ b/tests/pillar/client_container.sls
@@ -16,4 +16,4 @@
           - /srv/volumes/jenkins:/var/jenkins_home
     compose:
       source:
-        engine: pip
\ No newline at end of file
+        engine: pip
diff --git a/tests/pillar/client_images.sls b/tests/pillar/client_images.sls
index 69e4b60..0538c63 100644
--- a/tests/pillar/client_images.sls
+++ b/tests/pillar/client_images.sls
@@ -6,4 +6,4 @@
   client:
     enabled: true
     images:
-      - jenkins:2.7.1
\ No newline at end of file
+      - jenkins:2.7.1
diff --git a/tests/pillar/client_deploy.sls b/tests/pillar/client_stack.sls
similarity index 100%
rename from tests/pillar/client_deploy.sls
rename to tests/pillar/client_stack.sls
diff --git a/tests/pillar/host_single_proxy.sls b/tests/pillar/host.sls
similarity index 100%
rename from tests/pillar/host_single_proxy.sls
rename to tests/pillar/host.sls
diff --git a/tests/pillar/host_single.sls b/tests/pillar/host_single.sls
deleted file mode 100644
index 66aa4f9..0000000
--- a/tests/pillar/host_single.sls
+++ /dev/null
@@ -1,12 +0,0 @@
-docker:
-  host:
-    enabled: true
-    options:
-      bip: 192.168.0.1/24
-      log-driver: json-file
-      log-opts:
-        size: 50m
-      insecure-registry:
-      - srv01
-      - srv02
-      - srv03
diff --git a/tests/pillar/registry.sls b/tests/pillar/registry.sls
new file mode 100644
index 0000000..e336b64
--- /dev/null
+++ b/tests/pillar/registry.sls
@@ -0,0 +1,28 @@
+docker:
+  registry:
+    log:
+      level: debug
+      formatter: json
+    cache:
+      engine: redis
+      host: localhost
+    storage:
+      engine: filesystem
+      root: /srv/docker/registry
+    bind:
+      host: 0.0.0.0
+      port: 5000
+    hooks:
+      mail:
+        levels:
+          - panic
+        # Options are rendered as yaml as is so use hook-specific options here
+        options:
+          smtp:
+            addr: smtp.sendhost.com:25
+            username: sendername
+            password: password
+            insecure: true
+          from: name@sendhost.com
+          to:
+            - name@receivehost.com
diff --git a/tests/pillar/repo_docker.sls b/tests/pillar/repo_docker.sls
deleted file mode 100644
index 25bbdf1..0000000
--- a/tests/pillar/repo_docker.sls
+++ /dev/null
@@ -1,8 +0,0 @@
-linux:
-  system:
-    enabled: true
-    repo:
-      docker:
-        source: 'deb https://apt.dockerproject.org/repo/ ubuntu-{{ grains.get('oscodename') }} main'
-        key_id: 58118E89F3A912897C070ADBF76221572C52609D
-        key_server: hkp://p80.pool.sks-keyservers.net:80
diff --git a/tests/pillar/swarm.sls b/tests/pillar/swarm.sls
new file mode 100644
index 0000000..748841c
--- /dev/null
+++ b/tests/pillar/swarm.sls
@@ -0,0 +1,13 @@
+docker:
+  host:
+    enabled: true
+  swarm:
+    advertise_addr: 10.11.0.15
+    network:
+      docker_gwbridge:
+        opt:
+          com.docker.network.bridge.enable_icc: false
+          com.docker.network.bridge.enable_ip_masquerade: true
+          com.docker.network.bridge.name: docker_gwbridge
+        subnet: 10.20.0.0/16
+    role: master