diff --git a/spec/acceptance/10_basic_neutron_spec.rb b/spec/acceptance/10_basic_neutron_spec.rb
index a229b4394..3d78a37d2 100644
--- a/spec/acceptance/10_basic_neutron_spec.rb
+++ b/spec/acceptance/10_basic_neutron_spec.rb
@@ -15,14 +15,46 @@ describe 'basic neutron' do
       include openstack_integration::keystone
       include openstack_integration::neutron
 
-      neutron_network { 'mtutest':
+      neutron_network { 'private':
         mtu => 1000,
       }
+      neutron_subnet { 'private-subnet':
+        cidr         => '192.168.100.0/24',
+        ip_version   => '4',
+        network_name => 'private',
+      }
+      neutron_network { 'flat':
+        router_external           => true,
+        provider_network_type     => 'flat',
+        provider_physical_network => 'external',
+      }
+      neutron_subnet { 'flat-subnet':
+        cidr             => '172.24.5.0/24',
+        ip_version       => '4',
+        allocation_pools => ['start=172.24.5.10,end=172.24.5.200'],
+        gateway_ip       => '172.24.5.1',
+        enable_dhcp      => false,
+        network_name     => 'flat',
+      }
       neutron_network { 'vlan':
         provider_network_type     => 'vlan',
         provider_physical_network => 'external',
         provider_segmentation_id  => 100,
       }
+      neutron_subnet { 'vlan-subnet':
+        cidr             => '172.24.6.0/24',
+        ip_version       => '4',
+        allocation_pools => ['start=172.24.6.10,end=172.24.6.200'],
+        gateway_ip       => '172.24.6.1',
+        enable_dhcp      => false,
+        network_name     => 'vlan',
+      }
+      # TODO(tkajinam): Fix broken idempotency caused by gateway_network_name
+      #neutron_router { 'router':
+      #  gateway_network_name => 'flat',
+      #}
+      #neutron_router_interface { 'router:private':
+      #}
       EOS