diff --git a/lib/fog/azurerm/requests/storage/list_blobs.rb b/lib/fog/azurerm/requests/storage/list_blobs.rb
index 86671b799..faab7cae8 100644
--- a/lib/fog/azurerm/requests/storage/list_blobs.rb
+++ b/lib/fog/azurerm/requests/storage/list_blobs.rb
@@ -21,7 +21,7 @@ def list_blobs(container_name, options = {})
               Fog::Logger.debug msg
               temp = @blob_client.list_blobs(container_name, options)
               # Workaround for the issue https://github.com/Azure/azure-storage-ruby/issues/37
-              raise temp unless temp.instance_of?(Azure::Service::EnumerationResults)
+              raise temp unless temp.instance_of?(Azure::Storage::Common::Service::EnumerationResults)
 
               blobs += temp unless temp.empty?
               break if temp.continuation_token.nil? || temp.continuation_token.empty?
diff --git a/lib/fog/azurerm/requests/storage/list_containers.rb b/lib/fog/azurerm/requests/storage/list_containers.rb
index 193c18e5d..d65a9ae67 100644
--- a/lib/fog/azurerm/requests/storage/list_containers.rb
+++ b/lib/fog/azurerm/requests/storage/list_containers.rb
@@ -16,7 +16,7 @@ def list_containers
               Fog::Logger.debug msg
               temp = @blob_client.list_containers(options)
               # Workaround for the issue https://github.com/Azure/azure-storage-ruby/issues/37
-              raise temp unless temp.instance_of?(Azure::Service::EnumerationResults)
+              raise temp unless temp.instance_of?(Azure::Storage::Common::Service::EnumerationResults)
 
               containers += temp unless temp.empty?
               break if temp.continuation_token.nil? || temp.continuation_token.empty?
diff --git a/test/requests/storage/test_list_blobs.rb b/test/requests/storage/test_list_blobs.rb
index cd92611c4..e6e73c81f 100644
--- a/test/requests/storage/test_list_blobs.rb
+++ b/test/requests/storage/test_list_blobs.rb
@@ -13,11 +13,11 @@ def setup
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @blob_list = ApiStub::Requests::Storage::File.blob_list
-    @blobs1 = Azure::Service::EnumerationResults.new
+    @blobs1 = Azure::Storage::Common::Service::EnumerationResults.new
     @blobs1.continuation_token = 'marker'
     @blobs1.push(@blob_list[0])
     @blobs1.push(@blob_list[1])
-    @blobs2 = Azure::Service::EnumerationResults.new
+    @blobs2 = Azure::Storage::Common::Service::EnumerationResults.new
     @blobs2.push(@blob_list[2])
     @blobs2.push(@blob_list[3])
   end
diff --git a/test/requests/storage/test_list_containers.rb b/test/requests/storage/test_list_containers.rb
index a1f87b79e..e0a46a8e4 100644
--- a/test/requests/storage/test_list_containers.rb
+++ b/test/requests/storage/test_list_containers.rb
@@ -13,11 +13,11 @@ def setup
     @blob_client = @service.instance_variable_get(:@blob_client)
 
     @containers = ApiStub::Requests::Storage::Directory.container_list
-    @containers1 = Azure::Service::EnumerationResults.new
+    @containers1 = Azure::Storage::Common::Service::EnumerationResults.new
     @containers1.continuation_token = 'marker'
     @containers1.push(@containers[0])
     @containers1.push(@containers[1])
-    @containers2 = Azure::Service::EnumerationResults.new
+    @containers2 = Azure::Storage::Common::Service::EnumerationResults.new
     @containers2.push(@containers[2])
   end