diff --git a/manifests/services/fwaas.pp b/manifests/services/fwaas.pp
index acd933b8c..f944a47bd 100644
--- a/manifests/services/fwaas.pp
+++ b/manifests/services/fwaas.pp
@@ -45,6 +45,9 @@
 
   include ::neutron::params
 
+  # FWaaS needs to be enabled before starting Neutron L3 agent
+  Neutron_fwaas_service_config<||> ~> Service['neutron-l3']
+
   if ($::osfamily == 'Debian') {
     # Debian platforms
     if $vpnaas_agent_package {
diff --git a/spec/classes/neutron_services_fwaas_spec.rb b/spec/classes/neutron_services_fwaas_spec.rb
index 5d5ae5fe0..c72b1ddf5 100644
--- a/spec/classes/neutron_services_fwaas_spec.rb
+++ b/spec/classes/neutron_services_fwaas_spec.rb
@@ -22,7 +22,8 @@
 
 describe 'neutron::services::fwaas' do
   let :pre_condition do
-    "class { 'neutron': rabbit_password => 'passw0rd' }"
+    "class { 'neutron': rabbit_password => 'passw0rd' }
+     include ::neutron::agents::l3"
   end
 
   let :test_facts do