diff --git a/tests/pillar/common_storageclass.sls b/tests/pillar/common_storageclass.sls
index fbe6562..613cc13 100644
--- a/tests/pillar/common_storageclass.sls
+++ b/tests/pillar/common_storageclass.sls
@@ -15,7 +15,8 @@
       kube-system:
         enabled: true
     network:
-      engine: calico
+      cnis:
+      - calico
       calico:
         calicoctl_image: calico/ctl
         cni_image: calico/cni
@@ -41,8 +42,6 @@
     registry:
         host: tcpcloud
   common:
-    network:
-      engine: none
     addons:
       storageclass:
         nfs_elastic_1:
diff --git a/tests/pillar/master_cluster.sls b/tests/pillar/master_cluster.sls
index e734b66..06dcace 100644
--- a/tests/pillar/master_cluster.sls
+++ b/tests/pillar/master_cluster.sls
@@ -2,8 +2,6 @@
   common:
     cluster_domain: cluster.local
     cluster_name: cluster
-    network:
-      engine: none
     hyperkube:
       image: hyperkube-amd64:v1.6.4-3
       hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
@@ -70,7 +68,8 @@
       address: 10.0.175.100
       allow_privileged: true
     network:
-      engine: calico
+      cnis:
+      - calico
       calico:
         calicoctl_image: calico/ctl
         cni_image: calico/cni
diff --git a/tests/pillar/master_contrail.sls b/tests/pillar/master_contrail.sls
index a023108..627b032 100644
--- a/tests/pillar/master_contrail.sls
+++ b/tests/pillar/master_contrail.sls
@@ -3,7 +3,8 @@
     cluster_domain: cluster.local
     cluster_name: cluster
     network:
-      engine: opencontrail
+      cnis:
+      - opencontrail
     hyperkube:
       image: hyperkube-amd64:v1.6.4-3
       hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
@@ -74,7 +75,8 @@
       address: 10.0.175.100
       allow_privileged: true
     network:
-      engine: opencontrail
+      cnis:
+      - opencontrail
       contrail:
         config:
           api:
diff --git a/tests/pillar/master_contrail4_0.sls b/tests/pillar/master_contrail4_0.sls
index 8aaf016..e703b2e 100644
--- a/tests/pillar/master_contrail4_0.sls
+++ b/tests/pillar/master_contrail4_0.sls
@@ -3,7 +3,8 @@
     cluster_domain: cluster.local
     cluster_name: cluster
     network:
-      engine: opencontrail
+      cnis:
+      - opencontrail
     hyperkube:
       image: hyperkube-amd64:v1.6.4-3
       hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
@@ -71,7 +72,8 @@
       address: 10.0.175.100
       allow_privileged: true
     network:
-      engine: opencontrail
+      cnis:
+      - opencontrail
       contrail:
         version: 4.0
         private_ip_range: 10.150.0.0/16
diff --git a/tests/pillar/pool_cluster.sls b/tests/pillar/pool_cluster.sls
index 677d7b2..21c8448 100644
--- a/tests/pillar/pool_cluster.sls
+++ b/tests/pillar/pool_cluster.sls
@@ -2,8 +2,6 @@
   common:
     cluster_domain: cluster.local
     cluster_name: cluster
-    network:
-      engine: none
     hyperkube:
       image: hyperkube-amd64:v1.6.4-3
       hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
@@ -50,7 +48,8 @@
       kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
     ca: kubernetes
     network:
-      engine: calico
+      cnis:
+      - calico
       calico:
         calicoctl_image: calico/ctl
         cni_image: calico/cni
diff --git a/tests/pillar/pool_cluster_with_domain.sls b/tests/pillar/pool_cluster_with_domain.sls
index dba2f0b..9ad7f69 100644
--- a/tests/pillar/pool_cluster_with_domain.sls
+++ b/tests/pillar/pool_cluster_with_domain.sls
@@ -2,8 +2,6 @@
   common:
     cluster_domain: cluster.local
     cluster_name: cluster
-    network:
-      engine: none
     hyperkube:
       image: hyperkube-amd64:v1.6.4-3
       hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
@@ -51,7 +49,8 @@
       kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
     ca: kubernetes
     network:
-      engine: calico
+      cnis:
+      - calico
       calico:
         calicoctl_image: calico/ctl
         cni_image: calico/cni
diff --git a/tests/pillar/pool_contrail4_0.sls b/tests/pillar/pool_contrail4_0.sls
index ce5331e..3b0595c 100644
--- a/tests/pillar/pool_contrail4_0.sls
+++ b/tests/pillar/pool_contrail4_0.sls
@@ -2,8 +2,6 @@
   common:
     cluster_domain: cluster.local
     cluster_name: cluster
-    network:
-      engine: none
     hyperkube:
       image: hyperkube-amd64:v1.6.4-3
       hash: hnsj0XqABgrSww7Nqo7UVTSZLJUt2XRd
@@ -50,7 +48,8 @@
       kube_proxy: DFvQ8GelB7afH3wClC9romaMPhquyyEe
     ca: kubernetes
     network:
-      engine: opencontrail
+      cnis:
+      - opencontrail
       contrail:
         version: 4.0
         config: