diff --git a/spec/models/system_spec.rb b/spec/models/system_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/models/system_spec.rb
+++ b/spec/models/system_spec.rb
@@ -247,14 +247,18 @@ s  end
     end
   end
 
-  describe "available releases", :katello => true do
+  describe "available releases" do
     before do
       disable_product_orchestration
       @product = Product.create!(:name =>"prod1", :cp_id => '12345', :provider => @organization.redhat_provider, :environments => [@organization.library])
       @environment = KTEnvironment.create!({:name => "Dev", :prior => @organization.library, :organization => @organization}) do |e|
         e.products << @product
       end
-      env_product = @product.environment_products.where(:environment_id => @environment.id).first
+      if AppConfig.katello?
+        env_product = @product.environment_products.where(:environment_id => @environment.id).first
+      else
+        env_product = @product.environment_products.where(:environment_id => @organization.library.id).first
+      end
       @releases = %w[6.1 6.2 6Server]
       @releases.each do |release|
         Repository.create!(:name => "Repo #{release}",
@@ -277,6 +281,7 @@ s  end
     end
 
     it "returns all releases available for the current environment" do
+      x = @system.available_releases
       @system.available_releases.should == @releases.sort
     end
   end
fixed headpin-specific variation of available releases spec test