diff --git a/spec/api/v1/restrooms_spec.rb b/spec/api/v1/restrooms_spec.rb
index 23329a55..578d7cdf 100644
--- a/spec/api/v1/restrooms_spec.rb
+++ b/spec/api/v1/restrooms_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Restrooms API", type: :request do
+describe API::V1::Restrooms do
   it 'sends a list of restrooms order by date descending' do
     create_list(:restroom, 15)
 
diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb
index 4ddcd738..36bc3adf 100644
--- a/spec/controllers/pages_controller_spec.rb
+++ b/spec/controllers/pages_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe PagesController, type: :controller do
+describe PagesController do
   it_behaves_like 'localized request', :index
 
   it "#index" do
diff --git a/spec/controllers/restrooms_controller_spec.rb b/spec/controllers/restrooms_controller_spec.rb
index 1ba2372b..ec51c97e 100644
--- a/spec/controllers/restrooms_controller_spec.rb
+++ b/spec/controllers/restrooms_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe RestroomsController, type: :controller do
+describe RestroomsController do
   it_behaves_like 'localized request', :index
 
   it "#index" do
diff --git a/spec/features/contacts_spec.rb b/spec/features/contacts_spec.rb
index b3a6b89f..bd5e5eae 100644
--- a/spec/features/contacts_spec.rb
+++ b/spec/features/contacts_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'the contact process', type: :feature do
+describe 'the contact process' do
   it 'shows a generic contact when contact is not from restroom form' do
     restroom = create(:restroom, name: "Mission Creek Cafe")
 
diff --git a/spec/features/restrooms_spec.rb b/spec/features/restrooms_spec.rb
index 9c095d5a..e343fa8c 100644
--- a/spec/features/restrooms_spec.rb
+++ b/spec/features/restrooms_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'restrooms', type: :feature, js: true do
+describe 'restrooms', :js do
   describe 'submission' do
     it 'adds a restroom when submitted' do
       visit root_path
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4ef41a21..332ead25 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -37,6 +37,8 @@
   # instead of true.
   config.use_transactional_fixtures = true
 
+  config.infer_spec_type_from_file_location!
+
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.