diff --git a/spec/controllers/contacts_controller_spec.rb b/spec/controllers/contacts_controller_spec.rb
index 505ce52..6bc63f0 100644
--- a/spec/controllers/contacts_controller_spec.rb
+++ b/spec/controllers/contacts_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ContactsController do
+describe ContactsController, type: :controller do
   describe "GET new" do
     it "renders the contact form" do
       get :new
diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
index 44df2a4..304c68d 100644
--- a/spec/controllers/home_controller_spec.rb
+++ b/spec/controllers/home_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe HomeController do
+describe HomeController, type: :controller do
   describe "GET index" do
     it "renders the index template" do
       get :index
diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb
index 7369cfe..82b881f 100644
--- a/spec/controllers/pages_controller_spec.rb
+++ b/spec/controllers/pages_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe PagesController do
+describe PagesController, type: :controller do
   describe "GET show" do
     let(:test_page) { create(:page) }
 
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
index e40b0a0..c61791f 100644
--- a/spec/controllers/photos_controller_spec.rb
+++ b/spec/controllers/photos_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe PhotosController do
+describe PhotosController, type: :controller do
   describe "GET index" do
     it "renders the index template" do
       get :index
@@ -12,14 +12,14 @@ describe PhotosController do
     let(:photo) { create(:photo) }
 
     it "logs a photo view" do
-      Photo.any_instance.should_receive(:log_view).once
+      expect_any_instance_of(Photo).to receive(:log_view).once
       get :log_view, id: photo.id
-      should respond_with(:success)
+      expect(response).to be_successful
     end
 
     it "responds with not_found if the photo isn't present" do
       get :log_view, id: 999
-      should respond_with(:not_found)
+      expect(response.status).to eql(404)
     end
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index b539385..7ec9007 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,7 +2,6 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'capybara/rspec'
 require 'capybara/poltergeist'