diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
index 30b490e..10abae5 100644
--- a/spec/controllers/home_controller_spec.rb
+++ b/spec/controllers/home_controller_spec.rb
@@ -4,7 +4,7 @@ describe HomeController do
   describe "GET index" do
     it "responds with success" do
       get :index
-      expect(response).to be_successful
+      expect(response).to render_template(:index)
     end
   end
 end
diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb
new file mode 100644
index 0000000..2792029
--- /dev/null
+++ b/spec/controllers/pages_controller_spec.rb
@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe PagesController do
+  describe "GET show" do
+    let(:test_page) { FactoryGirl.create(:page) }
+
+    it "renders a page" do
+      get :show, name: test_page.name
+      expect(response).to render_template(:show)
+    end
+
+    it "renders 404 for a non existant page" do
+      get :show, name: "not-a-page"
+      expect(response.status).to eql(404)
+    end
+  end
+end
diff --git a/spec/factories/pages.rb b/spec/factories/pages.rb
new file mode 100644
index 0000000..2e93c52
--- /dev/null
+++ b/spec/factories/pages.rb
@@ -0,0 +1,9 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :page do
+    name "page"
+    title "Page"
+    content "This is a page."
+  end
+end