diff --git a/spec/models/visualization/member_spec.rb b/spec/models/visualization/member_spec.rb
index eca87eadaf..e1bcdd5eb0 100644
--- a/spec/models/visualization/member_spec.rb
+++ b/spec/models/visualization/member_spec.rb
@@ -20,7 +20,6 @@ describe Visualization::Member do
   end
 
   after(:all) do
-    Carto::User.find(@user.id).visualizations.each(&:delete)
     @user.destroy
   end
 
@@ -32,7 +31,7 @@ describe Visualization::Member do
     user_name = 'whatever'
     user_apikey = '123'
     @user_mock = mock
-    @user_mock.stubs(:id).returns(@user.id)
+    @user_mock.stubs(:id).returns(user_id)
     @user_mock.stubs(:username).returns(user_name)
     @user_mock.stubs(:api_key).returns(user_apikey)
     @user_mock.stubs(:viewer).returns(false)
diff --git a/spec/requests/admin/visualizations_spec.rb b/spec/requests/admin/visualizations_spec.rb
index 9cde1d239d..c5640f3fbd 100644
--- a/spec/requests/admin/visualizations_spec.rb
+++ b/spec/requests/admin/visualizations_spec.rb
@@ -251,9 +251,9 @@ describe Admin::VisualizationsController do
     end
 
     it 'returns public map for org users' do
-      org = OrganizationFactory.new.new_organization(name: 'public-map-spec-org').save
+      org = OrganizationFactory.new.new_organization.save
 
-      user_a = create_user({username: 'user-public-map', quota_in_bytes: 123456789, table_quota: 400})
+      user_a = create_user(quota_in_bytes: 123456789, table_quota: 400)
       user_org = CartoDB::UserOrganization.new(org.id, user_a.id)
       user_org.promote_user_to_admin
 
diff --git a/spec/support/factories/organizations.rb b/spec/support/factories/organizations.rb
index 5609a2849e..7c86a61a33 100644
--- a/spec/support/factories/organizations.rb
+++ b/spec/support/factories/organizations.rb
@@ -1,10 +1,14 @@
+require 'helpers/unique_names_helper'
+
+
 module CartoDB
   module Factories
+    include UniqueNamesHelper
 
     def new_organization(attributes = {})
       organization = Organization.new
 
-      organization.name =             attributes[:name] || 'vizzuality'
+      organization.name =             attributes[:name] || unique_name('organization')
       organization.seats =            attributes[:seats] || 10
       organization.quota_in_bytes =   attributes[:quota_in_bytes] || 100.megabytes
       organization.geocoding_quota =  attributes[:geocoding_quota] || 1000
diff --git a/zeus_plan.rb b/zeus_plan.rb
index 98121f27b2..fd7b0fcf16 100644
--- a/zeus_plan.rb
+++ b/zeus_plan.rb
@@ -22,6 +22,13 @@ class CustomPlan < Zeus::Rails
     if ENV['TURBO']
       clean_redis_databases
       clean_metadata_database
+
+      # TODO: This cleanup is necessary due to a bug in TableRelator.table_visualization
+      RSpec.configure do |config|
+        config.before(:all) do
+          Carto::Visualization.where(map_id: nil).each(&:delete)
+        end
+      end
     else
       RSpec.configure do |config|
         config.before(:all) do