diff --git a/tests/acceptance/signup_tests.rb b/tests/acceptance/signup_tests.rb
index d8f4030c..995b85b3 100644
--- a/tests/acceptance/signup_tests.rb
+++ b/tests/acceptance/signup_tests.rb
@@ -16,6 +16,7 @@ describe 'signup' do
       fill_in 'password', with: @site[:password]
       fill_in 'email',    with: @site[:email]
     rescue Capybara::ElementNotFound
+      puts "Waiting on fill_in #{Time.now - time} seconds"
       raise if Time.now - time > 30
       sleep 0.5
       retry
diff --git a/tests/environment.rb b/tests/environment.rb
index 91d0c0c0..3627c4af 100644
--- a/tests/environment.rb
+++ b/tests/environment.rb
@@ -4,7 +4,10 @@ raise 'Forget it.' if ENV['RACK_ENV'] == 'production'
 require 'coveralls'
 require 'simplecov'
 
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
 SimpleCov.coverage_dir File.join('tests', 'coverage')
 SimpleCov.start do
   add_filter "/migrations/"