diff --git a/spec/models/product_build_list_spec.rb b/spec/models/product_build_list_spec.rb
index 01f106b41..1aa179266 100644
--- a/spec/models/product_build_list_spec.rb
+++ b/spec/models/product_build_list_spec.rb
@@ -3,32 +3,44 @@ require 'spec_helper'
 describe ProductBuildList do
   before do
     stub_symlink_methods
-    FactoryGirl.create(:product_build_list)
   end
 
-  it { should belong_to(:product) }
+  context 'validates' do
+    before do
+      arch = double(:arch, id: 123, name: 'x86_64')
+      allow(Arch).to receive(:find_by).with(name: 'x86_64').and_return(arch)
+    end
 
-  it { should ensure_length_of(:main_script).is_at_most(255) }
-  it { should ensure_length_of(:params).is_at_most(255) }
+    it 'is valid given valid attributes' do
+      FactoryGirl.build(:product_build_list).should be_valid
+    end
 
-  it { should validate_presence_of(:product_id)}
-  it { should validate_presence_of(:status)}
+    it { should belong_to(:product) }
 
-  ProductBuildList::STATUSES.each do |value|
-    it {should allow_value(value).for(:status)}
+    it { should ensure_length_of(:main_script).is_at_most(255) }
+    it { should ensure_length_of(:params).is_at_most(255) }
+
+    it { should validate_presence_of(:product_id)}
+    it { should validate_presence_of(:status)}
+
+    ProductBuildList::STATUSES.each do |value|
+      it {should allow_value(value).for(:status)}
+    end
+
+    it {should_not allow_value(555).for(:status)}
+
+    it { should have_readonly_attribute(:product_id) }
+    #it { should_not allow_mass_assignment_of(:product_id) }
+
+    it { should allow_mass_assignment_of(:status) }
+    it { should allow_mass_assignment_of(:base_url) }
   end
 
-  it {should_not allow_value(555).for(:status)}
-
-  it { should have_readonly_attribute(:product_id) }
-  #it { should_not allow_mass_assignment_of(:product_id) }
-
-  it { should allow_mass_assignment_of(:status) }
-  it { should allow_mass_assignment_of(:base_url) }
-
   # see app/ability.rb
   # can :read, ProductBuildList#, product: {platform: {visibility: 'open'}} # double nested hash don't work
   it 'should generate correct sql to get product build lists' do
+    FactoryGirl.create(:arch, name: 'x86_64')
+    FactoryGirl.create(:product_build_list)
     user = FactoryGirl.create(:user)
     ability = Ability.new user
     ProductBuildList.accessible_by(ability).count.should == 1