diff --git a/tests/aws/models/data_pipeline/pipeline_tests.rb b/tests/aws/models/data_pipeline/pipeline_tests.rb
index 180193525..7ba0ab23b 100644
--- a/tests/aws/models/data_pipeline/pipeline_tests.rb
+++ b/tests/aws/models/data_pipeline/pipeline_tests.rb
@@ -1,6 +1,7 @@
 Shindo.tests("AWS::DataPipeline | pipelines", ['aws', 'data_pipeline']) do
 
-  model_tests(Fog::AWS[:data_pipeline].pipelines, { id: uniq_id }) do
-    @instance.wait_for { ready? }
+  unique_id = uniq_id
+  model_tests(Fog::AWS[:data_pipeline].pipelines, { id: unique_id, name: "#{unique_id}-name", unique_id: unique_id }) do
+    @instance.wait_for { state }
   end
 end
diff --git a/tests/aws/models/data_pipeline/pipelines_tests.rb b/tests/aws/models/data_pipeline/pipelines_tests.rb
index 8539e9c2d..835e9cecc 100644
--- a/tests/aws/models/data_pipeline/pipelines_tests.rb
+++ b/tests/aws/models/data_pipeline/pipelines_tests.rb
@@ -1,6 +1,7 @@
 Shindo.tests("AWS::DataPipeline | pipelines", ['aws', 'data_pipeline']) do
 
-  collection_tests(Fog::AWS[:data_pipeline].servers, { id: uniq_id }) do
-    @instance.wait_for { ready? }
+  unique_id = uniq_id
+  collection_tests(Fog::AWS[:data_pipeline].pipelines, { id: unique_id, name: "#{unique_id}-name", unique_id: unique_id }) do
+    @instance.wait_for { state }
   end
 end