diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 50d9eaddfd..95b31d799e 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -31,12 +31,45 @@ namespace :openfoodweb do
         end
       end
 
+      # -- Addresses
+      unless Spree::Address.find_by_zipcode "3160"
+        puts "[#{task_name}] Seeding addresses"
+        Spree::Address.delete_all
+
+        FactoryGirl.create(:address, :address1 => "25 Myrtle Street", :zipcode => "3153", :city => "Bayswater")
+        FactoryGirl.create(:address, :address1 => "6 Rollings Road", :zipcode => "3156", :city => "Upper Ferntree Gully")
+        FactoryGirl.create(:address, :address1 => "72 Lake Road", :zipcode => "3130", :city => "Blackburn")
+        FactoryGirl.create(:address, :address1 => "7 Verbena Street", :zipcode => "3195", :city => "Mordialloc")
+        FactoryGirl.create(:address, :address1 => "20 Galvin Street", :zipcode => "3018", :city => "Altona")
+        FactoryGirl.create(:address, :address1 => "59 Websters Road", :zipcode => "3106", :city => "Templestowe")
+        FactoryGirl.create(:address, :address1 => "17 Torresdale Drive", :zipcode => "3155", :city => "Boronia")
+        FactoryGirl.create(:address, :address1 => "21 Robina CRT", :zipcode => "3764", :city => "Kilmore")
+        FactoryGirl.create(:address, :address1 => "25 Kendall Street", :zipcode => "3134", :city => "Ringwood")
+        FactoryGirl.create(:address, :address1 => "2 Mines Road", :zipcode => "3135", :city => "Ringwood East")
+        FactoryGirl.create(:address, :address1 => "183 Millers Road", :zipcode => "3025", :city => "Altona North")
+        FactoryGirl.create(:address, :address1 => "310 Pascoe Vale Road", :zipcode => "3040", :city => "Essendon")
+        FactoryGirl.create(:address, :address1 => "6 Martin Street", :zipcode => "3160", :city => "Belgrave")
+      end
+
       # -- Enterprises
       unless Enterprise.count > 0
         puts "[#{task_name}] Seeding enterprises"
+        Enterprise.delete_all
 
-        3.times { FactoryGirl.create(:supplier_enterprise) }
-        3.times { FactoryGirl.create(:distributor_enterprise) }
+        3.times { FactoryGirl.create(:supplier_enterprise, :address => Spree::Address.find_by_zipcode("3160")) }
+
+        FactoryGirl.create(:distributor_enterprise, :address => Spree::Address.find_by_zipcode("3153"))
+        FactoryGirl.create(:distributor_enterprise, :address => Spree::Address.find_by_zipcode("3156"))
+        FactoryGirl.create(:distributor_enterprise, :address => Spree::Address.find_by_zipcode("3130"))
+        FactoryGirl.create(:distributor_enterprise, :address => Spree::Address.find_by_zipcode("3195"))
+        FactoryGirl.create(:distributor_enterprise, :address => Spree::Address.find_by_zipcode("3018"))
+        FactoryGirl.create(:distributor_enterprise, :address => Spree::Address.find_by_zipcode("3106"))
+        FactoryGirl.create(:distributor_enterprise, :address => Spree::Address.find_by_zipcode("3155"))
+        FactoryGirl.create(:distributor_enterprise, :address => Spree::Address.find_by_zipcode("3764"))
+        FactoryGirl.create(:distributor_enterprise, :address => Spree::Address.find_by_zipcode("3134"))
+        FactoryGirl.create(:distributor_enterprise, :address => Spree::Address.find_by_zipcode("3135"))
+        FactoryGirl.create(:distributor_enterprise, :address => Spree::Address.find_by_zipcode("3025"))
+        FactoryGirl.create(:distributor_enterprise, :address => Spree::Address.find_by_zipcode("3040"))
       end
 
       unless Spree::ShippingMethod.all.any? { |sm| sm.calculator.is_a? OpenFoodWeb::Calculator::Itemwise }