diff --git a/tests/pillar/compute_dpdk.sls b/tests/pillar/compute_dpdk.sls
index c56fb81..2fb1462 100644
--- a/tests/pillar/compute_dpdk.sls
+++ b/tests/pillar/compute_dpdk.sls
@@ -6,8 +6,8 @@
       engine: ml2
       tenant_network_types: "flat,vlan"
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
     dvr: false
     enabled: true
     external_access: false
diff --git a/tests/pillar/compute_dvr.sls b/tests/pillar/compute_dvr.sls
index 8d5f7d5..a6a512e 100644
--- a/tests/pillar/compute_dvr.sls
+++ b/tests/pillar/compute_dvr.sls
@@ -5,8 +5,8 @@
       engine: ml2
       tenant_network_types: "flat,vxlan"
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
     dvr: true
     enabled: true
     external_access: true
diff --git a/tests/pillar/compute_dvr_fwaas_v1.sls b/tests/pillar/compute_dvr_fwaas_v1.sls
index a4b86d2..f483775 100644
--- a/tests/pillar/compute_dvr_fwaas_v1.sls
+++ b/tests/pillar/compute_dvr_fwaas_v1.sls
@@ -5,8 +5,8 @@
       engine: ml2
       tenant_network_types: "flat,vxlan"
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
     dvr: true
     enabled: true
     external_access: true
diff --git a/tests/pillar/compute_legacy.sls b/tests/pillar/compute_legacy.sls
index 154af25..194e431 100644
--- a/tests/pillar/compute_legacy.sls
+++ b/tests/pillar/compute_legacy.sls
@@ -5,8 +5,8 @@
       engine: ml2
       tenant_network_types: "flat,vxlan"
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
     dvr: false
     enabled: true
     external_access: false
diff --git a/tests/pillar/compute_nonexternal_dvr.sls b/tests/pillar/compute_nonexternal_dvr.sls
index 8ce0da1..54ad7b3 100644
--- a/tests/pillar/compute_nonexternal_dvr.sls
+++ b/tests/pillar/compute_nonexternal_dvr.sls
@@ -5,8 +5,8 @@
       engine: ml2
       tenant_network_types: "flat,vxlan"
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
     dvr: true
     enabled: true
     external_access: false
diff --git a/tests/pillar/compute_qos.sls b/tests/pillar/compute_qos.sls
index 2122e00..b8a2699 100644
--- a/tests/pillar/compute_qos.sls
+++ b/tests/pillar/compute_qos.sls
@@ -5,8 +5,8 @@
       engine: ml2
       tenant_network_types: "flat,vxlan"
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
     dvr: false
     enabled: true
     qos: true
diff --git a/tests/pillar/compute_qos_sriov.sls b/tests/pillar/compute_qos_sriov.sls
index 7d4d4ab..5d5fb39 100644
--- a/tests/pillar/compute_qos_sriov.sls
+++ b/tests/pillar/compute_qos_sriov.sls
@@ -9,8 +9,8 @@
           devname: eth1
           physical_network: physnet3
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
     dvr: false
     enabled: true
     qos: true
diff --git a/tests/pillar/compute_sriov.sls b/tests/pillar/compute_sriov.sls
index f5a106f..1e85ccd 100644
--- a/tests/pillar/compute_sriov.sls
+++ b/tests/pillar/compute_sriov.sls
@@ -9,8 +9,8 @@
           devname: eth1
           physical_network: physnet3
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
     dvr: false
     enabled: true
     external_access: false
diff --git a/tests/pillar/control_dvr.sls b/tests/pillar/control_dvr.sls
index 5031810..2156670 100644
--- a/tests/pillar/control_dvr.sls
+++ b/tests/pillar/control_dvr.sls
@@ -4,8 +4,8 @@
       engine: ml2
       external_mtu: 1500
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
       tenant_network_types: flat,vxlan
     bind:
       address: 172.16.10.101
diff --git a/tests/pillar/control_fwaas_v1.sls b/tests/pillar/control_fwaas_v1.sls
index c39f05c..88f91ca 100644
--- a/tests/pillar/control_fwaas_v1.sls
+++ b/tests/pillar/control_fwaas_v1.sls
@@ -4,8 +4,8 @@
       engine: ml2
       external_mtu: 1500
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
       tenant_network_types: flat,vxlan
     bind:
       address: 172.16.10.101
diff --git a/tests/pillar/control_lbaas_octavia.sls b/tests/pillar/control_lbaas_octavia.sls
index 65b0318..d96c3aa 100644
--- a/tests/pillar/control_lbaas_octavia.sls
+++ b/tests/pillar/control_lbaas_octavia.sls
@@ -4,8 +4,8 @@
       engine: ml2
       external_mtu: 1500
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
       tenant_network_types: flat,vxlan
     bind:
       address: 172.16.10.101
diff --git a/tests/pillar/control_nodvr.sls b/tests/pillar/control_nodvr.sls
index 9597eee..00a261c 100644
--- a/tests/pillar/control_nodvr.sls
+++ b/tests/pillar/control_nodvr.sls
@@ -4,8 +4,8 @@
       engine: ml2
       external_mtu: 1500
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
       tenant_network_types: flat,vxlan
     bind:
       address: 172.16.10.101
diff --git a/tests/pillar/control_qos.sls b/tests/pillar/control_qos.sls
index 9bed6b5..d2fa118 100644
--- a/tests/pillar/control_qos.sls
+++ b/tests/pillar/control_qos.sls
@@ -4,8 +4,8 @@
       engine: ml2
       external_mtu: 1500
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
       tenant_network_types: flat,vxlan
     bind:
       address: 172.16.10.101
diff --git a/tests/pillar/gateway_dvr.sls b/tests/pillar/gateway_dvr.sls
index 2c47529..055997b 100644
--- a/tests/pillar/gateway_dvr.sls
+++ b/tests/pillar/gateway_dvr.sls
@@ -5,8 +5,8 @@
       engine: ml2
       tenant_network_types: "flat,vxlan"
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
     dvr: true
     enabled: true
     external_access: True
diff --git a/tests/pillar/gateway_legacy.sls b/tests/pillar/gateway_legacy.sls
index d9b7ef8..75db492 100644
--- a/tests/pillar/gateway_legacy.sls
+++ b/tests/pillar/gateway_legacy.sls
@@ -5,8 +5,8 @@
       engine: ml2
       tenant_network_types: "flat,vxlan"
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
     dvr: false
     enabled: true
     external_access: True
diff --git a/tests/pillar/gateway_legacy_fwaas_v1.sls b/tests/pillar/gateway_legacy_fwaas_v1.sls
index 34e921c..2eacc5c 100644
--- a/tests/pillar/gateway_legacy_fwaas_v1.sls
+++ b/tests/pillar/gateway_legacy_fwaas_v1.sls
@@ -5,8 +5,8 @@
       engine: ml2
       tenant_network_types: "flat,vxlan"
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
     dvr: false
     enabled: true
     external_access: True
diff --git a/tests/pillar/gateway_qos.sls b/tests/pillar/gateway_qos.sls
index fea882e..f5c3b0b 100644
--- a/tests/pillar/gateway_qos.sls
+++ b/tests/pillar/gateway_qos.sls
@@ -5,8 +5,8 @@
       engine: ml2
       tenant_network_types: "flat,vxlan"
       mechanism:
-        ovs:
-          driver: openvswitch
+        - openvswitch
+        - l2population
     dvr: false
     enabled: true
     qos: true