diff --git a/bin/dev b/bin/dev
index 1c77800e3..1c3b7427a 100755
--- a/bin/dev
+++ b/bin/dev
@@ -4,6 +4,7 @@ bin/rails runner - <<EOF
   puts "Login with david@37signals.com / secret123456 to:"
   ApplicationRecord.with_each_tenant do |tenant|
     next unless tenant =~ /\A\d+\z/
+    next unless Account.count > 0
     puts "  - #{Account.sole.name}: http://fizzy.localhost:3006#{Account.sole.slug}"
   end
 EOF
diff --git a/test/fixtures/accounts.yml b/test/fixtures/accounts.yml
index 205eee369..587f05a44 100644
--- a/test/fixtures/accounts.yml
+++ b/test/fixtures/accounts.yml
@@ -1,6 +1,3 @@
 37s:
   name: 37signals
   join_code: "ejpP-THlQ-Cc2f"
-<% if Account.reflect_on_association :external_account %>
-  tenant_id: <%= ActiveRecord::FixtureSet.identify :'37s_fizzy' %>
-<% end %>
diff --git a/test/test_helper.rb b/test/test_helper.rb
index fbb2b1149..13ca29e55 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,7 +1,8 @@
 ENV["RAILS_ENV"] ||= "test"
 require_relative "../config/environment"
 
-Rails.application.config.active_record_tenanted.default_tenant = ActiveRecord::FixtureSet.identify :'37s_fizzy'
+# there's no fixture for this, we're just generating a stable integer
+Rails.application.config.active_record_tenanted.default_tenant = ActiveRecord::FixtureSet.identify "37s_fizzy"
 
 require "rails/test_help"
 require "webmock/minitest"