diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb
index 58a7c93346..e59f15f85b 100644
--- a/app/models/spree/product_decorator.rb
+++ b/app/models/spree/product_decorator.rb
@@ -23,7 +23,7 @@ Spree::Product.class_eval do
 
   # Build a product distribution for each distributor
   def build_product_distributions
-    Distributor.all.each do |distributor|
+    Enterprise.is_distributor.each do |distributor|
       unless self.product_distributions.find_by_distributor_id distributor.id
         self.product_distributions.build(:distributor => distributor)
       end
diff --git a/app/views/spree/admin/products/_supplier_form.html.haml b/app/views/spree/admin/products/_supplier_form.html.haml
index e4cd8280a7..9bfc0bec4a 100644
--- a/app/views/spree/admin/products/_supplier_form.html.haml
+++ b/app/views/spree/admin/products/_supplier_form.html.haml
@@ -1,5 +1,5 @@
 = f.field_container :supplier do
   = f.label :supplier
   %br
-  = f.collection_select(:supplier_id, Supplier.all, :id, :name, :include_blank => true)
+  = f.collection_select(:supplier_id, Enterprise.is_supplier, :id, :name, :include_blank => true)
   = f.error_message_on :supplier
diff --git a/spec/requests/admin/product_spec.rb b/spec/requests/admin/product_spec.rb
index 37d9935dd2..fff5417726 100644
--- a/spec/requests/admin/product_spec.rb
+++ b/spec/requests/admin/product_spec.rb
@@ -8,8 +8,8 @@ feature %q{
   include WebHelper
 
   background do
-    @supplier = create(:supplier, :name => 'New supplier')
-    @distributors = (1..3).map { create(:distributor) }
+    @supplier = create(:supplier_enterprise, :name => 'New supplier')
+    @distributors = (1..3).map { create(:distributor_enterprise) }
     @shipping_method = create(:shipping_method, :name => 'My shipping method')
   end
 
diff --git a/spec/requests/admin/shipping_methods_spec.rb b/spec/requests/admin/shipping_methods_spec.rb
index a72cff3e3a..d794e382c2 100644
--- a/spec/requests/admin/shipping_methods_spec.rb
+++ b/spec/requests/admin/shipping_methods_spec.rb
@@ -27,7 +27,7 @@ feature 'shipping methods' do
 
   scenario "deleting a shipping method referenced by a product distribution" do
     p = create(:product)
-    d = create(:distributor)
+    d = create(:distributor_enterprise)
     create(:product_distribution, product: p, distributor: d, shipping_method: @sm)
 
     visit_delete spree.admin_shipping_method_path(@sm)
@@ -38,7 +38,7 @@ feature 'shipping methods' do
 
   scenario "deleting a shipping method referenced by a line item" do
     sm2 = create(:shipping_method)
-    d = create(:distributor)
+    d = create(:distributor_enterprise)
 
     p = create(:product)
     create(:product_distribution, product: p, distributor: d, shipping_method: sm2)