diff --git a/runtest/salttest/states/openstack/octavia_loadbalancer.sls b/runtest/salttest/states/openstack/octavia_loadbalancer.sls
new file mode 100644
index 0000000..bca08e6
--- /dev/null
+++ b/runtest/salttest/states/openstack/octavia_loadbalancer.sls
@@ -0,0 +1,9 @@
+{%- set neutron_test_subnet = 'OctaviaStateTestSubnet' %}
+
+{%- set subnet_id = salt['neutronv2.subnet_list'](cloud_name='admin_identity',name=neutron_test_subnet)['subnets'][0].id %}
+
+octavia_loadbalancer:
+  octaviav2.loadbalancer_present:
+    - cloud_name: admin_identity
+    - name: loadbalacer1
+    - vip_subnet_id: {{ subnet_id }}
diff --git a/runtest/salttest/states/openstack/octavia_network.sls b/runtest/salttest/states/openstack/octavia_network.sls
new file mode 100644
index 0000000..dac98c8
--- /dev/null
+++ b/runtest/salttest/states/openstack/octavia_network.sls
@@ -0,0 +1,15 @@
+{%- set neutron_test_network = 'OctaviaStateTestNetwork' %}
+{%- set neutron_test_subnet = 'OctaviaStateTestSubnet' %}
+
+neutronv2_network_present:
+  neutronv2.network_present:
+  - cloud_name: admin_identity
+  - name: {{ neutron_test_network }}
+
+neutronv2_subnet_present:
+  neutronv2.subnet_present:
+  - name: {{ neutron_test_subnet }}
+  - cloud_name: admin_identity
+  - network_id: {{ neutron_test_network }}
+  - ip_version: 4
+  - cidr: 192.168.101.0/24
diff --git a/runtest/salttest/states/openstack/octaviav2.sls b/runtest/salttest/states/openstack/octaviav2.sls
index ad97a90..f7a00c1 100644
--- a/runtest/salttest/states/openstack/octaviav2.sls
+++ b/runtest/salttest/states/openstack/octaviav2.sls
@@ -1,23 +1,13 @@
-{%- set neutron_test_network = 'OctaviaStateTestNetwork' %}
-{%- set neutron_test_subnet = 'OctaviaStateTestSubnet' %}
+create_network:
+  salt.state:
+  - tgt: 'I@neutron:client'
+  - tgt_type: compound
+  - sls: runtest.salttest.states.openstack.octavia_network
+  - concurrent: true
 
-neutronv2_network_present:
-  neutronv2.network_present:
-  - cloud_name: admin_identity
-  - name: {{ neutron_test_network }}
-
-neutronv2_subnet_present:
-  neutronv2.subnet_present:
-  - name: {{ neutron_test_subnet }}
-  - cloud_name: admin_identity
-  - network_id: {{ neutron_test_network }}
-  - ip_version: 4
-  - cidr: 192.168.100.0/24
-
-{%- set subnet_id = salt['neutronv2.subnet_list'](cloud_name='admin_identity',name=neutron_test_subnet)['subnets'][0].id %}
-
-octavia_loadbalancer:
-  octaviav2.loadbalancer_present:
-    - cloud_name: admin_identity
-    - name: lb1
-    - vip_subnet_id: {{ subnet_id }}
+create_lb:
+  salt.state:
+  - tgt: 'I@octavia:client'
+  - tgt_type: compound
+  - sls: runtest.salttest.states.openstack.octavia_loadbalancer
+  - concurrent: true