diff --git a/lib/fog/aws/service_mapper.rb b/lib/fog/aws/service_mapper.rb
index 2766dab82..10674b861 100644
--- a/lib/fog/aws/service_mapper.rb
+++ b/lib/fog/aws/service_mapper.rb
@@ -79,7 +79,7 @@ module Fog
                         Fog::Logger.warning("AWS[:compute] is not recommended, use Compute[:aws] for portability")
                         Fog::Compute.new(:provider => 'AWS')
                       when :data_pipeline
-                        Fog::AWS::DataPipeline
+                        Fog::AWS::DataPipeline.new
                       when :ddb, :dynamodb
                         Fog::AWS::DynamoDB.new
                       when :dns
diff --git a/spec/fog/bin/aws_spec.rb b/spec/fog/bin/aws_spec.rb
index 9920b8a4c..625f47ec5 100644
--- a/spec/fog/bin/aws_spec.rb
+++ b/spec/fog/bin/aws_spec.rb
@@ -83,8 +83,8 @@ describe AWS do
     describe "when service is recognised" do
       it "returns correct instance" do
         KEY_CLASS_MAPPING.each do |key, klass|
-          klass.stub(:new, true) do
-            assert klass, AWS[key]
+          klass.stub(:new, "#{klass} instance") do
+            assert_equal "#{klass} instance", AWS[key]
           end
         end
       end