diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb
index 556c241..b15d18b 100644
--- a/spec/dummy/config/environments/test.rb
+++ b/spec/dummy/config/environments/test.rb
@@ -8,7 +8,7 @@
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching
diff --git a/spec/generators/pages/setup_generator_spec.rb b/spec/generators/pages/setup_generator_spec.rb
index bc55388..1891f2e 100644
--- a/spec/generators/pages/setup_generator_spec.rb
+++ b/spec/generators/pages/setup_generator_spec.rb
@@ -12,6 +12,6 @@
   end
 
   it 'creates app/views/pages' do
-    Dir.exist?(File.expand_path('app/views/pages', destination_root)).should be_true
+    expect(Dir.exist?(File.expand_path('app/views/pages', destination_root))).to be_truthy
   end
 end
diff --git a/spec/requests/pages_spec.rb b/spec/requests/pages_spec.rb
index 7d9413b..6bd71aa 100644
--- a/spec/requests/pages_spec.rb
+++ b/spec/requests/pages_spec.rb
@@ -3,45 +3,45 @@
 feature 'Pages' do
   scenario 'loads the About Page' do
     visit '/about'
-    page.should have_content 'About Page'
+    expect(page).to have_content 'About Page'
   end
 
   scenario 'loads the Contact Page then loads the Team Page' do
     visit '/contact'
-    page.should have_content 'Contact Page'
+    expect(page).to have_content 'Contact Page'
     visit '/team'
-    page.should have_content 'Team Page'
+    expect(page).to have_content 'Team Page'
   end
 
   scenario 'loads the Press Kit Page' do
     visit '/press-kit'
-    page.should have_content 'Press Kit Page'
+    expect(page).to have_content 'Press Kit Page'
   end
 
   scenario 'loads the Record Deal Page, then loads the User Agreement Page' do
     visit '/record-deal'
-    page.should have_content 'Record Deal Page'
+    expect(page).to have_content 'Record Deal Page'
     visit '/user-agreement'
-    page.should have_content 'User Agreement Page'
+    expect(page).to have_content 'User Agreement Page'
   end
 
   scenario 'allows namespacing of pages' do
     visit '/work/client'
-    page.should have_content 'Client'
+    expect(page).to have_content 'Client'
   end
 
   scenario 'allows plural namespacing of pages' do
     visit '/jobs/new_hire'
-    page.should have_content 'New Hire'
+    expect(page).to have_content 'New Hire'
   end
 
   scenario 'can override :as and get new path' do
     visit one_two_three_path
-    page.should have_content '123 Page'
+    expect(page).to have_content '123 Page'
   end
 
   scenario 'can override :as and preserves url' do
     visit '/123'
-    page.should have_content '123 Page'
+    expect(page).to have_content '123 Page'
   end
 end