diff --git a/scripts/verify-tff-mapping b/scripts/verify-tff-mapping
index 672bbe159771c1c160e9fd9b0a52d847b8305ade..99a13428f9bf9a978e7f557366f815fe40c9064f 100755
--- a/scripts/verify-tff-mapping
+++ b/scripts/verify-tff-mapping
@@ -225,6 +225,19 @@ tests = [
     explanation: 'Map EE rake tasks',
     source: 'ee/lib/tasks/geo.rake',
     expected: ['ee/spec/tasks/geo_rake_spec.rb']
+  },
+  {
+    explanation: 'Map controllers to request specs',
+    source: 'app/controllers/admin/abuse_reports_controller.rb',
+    expected: ['spec/requests/admin/abuse_reports_controller_spec.rb']
+  },
+  {
+    explanation: 'Map EE controllers to controller and request specs',
+    source: 'ee/app/controllers/users_controller.rb',
+    expected: [
+      'ee/spec/controllers/users_controller_spec.rb',
+      'ee/spec/requests/users_controller_spec.rb'
+    ]
   }
 ]
 
diff --git a/tests.yml b/tests.yml
index 5f17ab1bb10baf48c2fd29aceb57d2f5aaf5d97f..4e895b961fb7067fa062f858d9a31b2cd744868a 100644
--- a/tests.yml
+++ b/tests.yml
@@ -55,6 +55,10 @@ mapping:
   - source: '(ee/)?app/views/(.+)\.haml'
     test: '%sspec/views/%s.haml_spec.rb'
 
+  # EE/FOSS controllers should map to request specs
+  - source: '(ee/)?app/controllers/(.+)\.rb'
+    test: '%sspec/requests/%s_spec.rb'
+
   # EE/FOSS spec code should map to itself
   - source: '(.+)_spec\.rb'
     test: '%s_spec.rb'