diff --git a/spec/integration/v1/workers_spec.rb b/spec/integration/v1/workers_spec.rb
index 11bdf4ec..34edd9e3 100644
--- a/spec/integration/v1/workers_spec.rb
+++ b/spec/integration/v1/workers_spec.rb
@@ -4,8 +4,8 @@ describe 'Workers' do
   before(:each) do
     Time.stubs(:now).returns(Time.utc(2011, 11, 11, 11, 11, 11))
     @workers = [
-      Factory(:worker, :name => 'worker-1', :state => :working),
-      Factory(:worker, :name => 'worker-2', :state => :errored)
+      Worker.new('1', full_name: 'ruby1:ruby1.travis-ci.org'),
+      Worker.new('2', full_name: 'ruby2:ruby1.travis-ci.org')
     ]
   end
 
@@ -14,8 +14,9 @@ describe 'Workers' do
   attr_reader :workers
 
   it 'GET /workers' do
+    Worker.stubs(all: @workers)
     response = get '/workers', {}, headers
-    response.should deliver_json_for(Worker.order(:host, :name), version: 'v1')
+    response.should deliver_json_for(@workers, version: 'v1', type: 'workers')
   end
 end
 
diff --git a/spec/integration/v2/workers_spec.rb b/spec/integration/v2/workers_spec.rb
index 17231394..35f03e36 100644
--- a/spec/integration/v2/workers_spec.rb
+++ b/spec/integration/v2/workers_spec.rb
@@ -4,8 +4,8 @@ describe 'Workers' do
   before(:each) do
     Time.stubs(:now).returns(Time.utc(2011, 11, 11, 11, 11, 11))
     @workers = [
-      Factory(:worker, :name => 'worker-1', :state => :working),
-      Factory(:worker, :name => 'worker-2', :state => :errored)
+      Worker.new('1', full_name: 'ruby1:ruby1.travis-ci.org'),
+      Worker.new('2', full_name: 'ruby2:ruby1.travis-ci.org')
     ]
   end
 
@@ -14,8 +14,9 @@ describe 'Workers' do
   attr_reader :workers
 
   it 'GET /workers' do
+    Worker.stubs(all: @workers)
     response = get '/workers', {}, headers
-    response.should deliver_json_for(Worker.order(:host, :name), version: 'v2')
+    response.should deliver_json_for(@workers, version: 'v2', type: 'workers')
   end
 end