diff --git a/app/uploaders/processed_image.rb b/app/uploaders/processed_image.rb
index 226fe0df4..5992fa2ee 100644
--- a/app/uploaders/processed_image.rb
+++ b/app/uploaders/processed_image.rb
@@ -14,7 +14,10 @@ class ProcessedImage < CarrierWave::Uploader::Base
   end
 
   def filename
-    model.random_string + File.extname(@filename) if @filename
+    fn = model.random_string
+    fn += "-test" if Rails.env == 'test'
+    fn += File.extname(@filename) if @filename
+    fn
   end
 
   version :thumb_small do
diff --git a/app/uploaders/unprocessed_image.rb b/app/uploaders/unprocessed_image.rb
index 579241253..c21ca2091 100644
--- a/app/uploaders/unprocessed_image.rb
+++ b/app/uploaders/unprocessed_image.rb
@@ -14,7 +14,10 @@ class UnprocessedImage < CarrierWave::Uploader::Base
   end
 
   def filename
-    model.random_string + File.extname(@filename) if @filename
+    fn = model.random_string
+    fn += "-test" if Rails.env == 'test'
+    fn += File.extname(@filename) if @filename
+    fn
   end
 
   version :thumb_small
diff --git a/features/support/env.rb b/features/support/env.rb
index a00b28268..a304a6cb2 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -52,6 +52,13 @@ Before do
   Devise.mailer.deliveries = []
 end
 
+After do
+  # Rollback any images created during the features.
+  `rm -rf #{Rails.root}/tmp/uploads/*`
+  `rm -rf #{Rails.root}/public/uploads/images/*-test.png`
+  `rm -rf #{Rails.root}/public/uploads/tmp/`
+end
+
 silence_warnings do
   SERVICES['facebook'] = {'app_id' => :fake, 'app_secret' => 'sdoigjosdfijg'}
   AppConfig[:configured_services] << 'facebook'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c232f4e47..ef4eef7cb 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -41,7 +41,10 @@ RSpec.configure do |config|
   end
 
   config.after(:all) do
+    # Rollback any images created during the specs
     `rm -rf #{Rails.root}/tmp/uploads/*`
+    `rm -rf #{Rails.root}/public/uploads/images/*-test.png`
+    `rm -rf #{Rails.root}/public/uploads/tmp/`
   end
 end