diff --git a/Gemfile b/Gemfile
index 83c6b693a56e051481894ee9600a2b3b7b4758dc..17b234dd85ec26e1e2c176cb4eb343b3c838b3a7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,11 @@ source "https://rubygems.org" do
   gem "faraday",             "~> 1.0", :require => false
   gem "faraday_middleware",  "~> 1.0.0.rc1", :require => false
   gem "net-http-persistent", "~> 4.0", :require => false
-  gem "nokogiri",            "~> 1.10.4", :require => false
+  if RUBY_VERSION.start_with?("2.3") then
+    gem "nokogiri",            "~> 1.10.4", :require => false
+  else
+    gem "nokogiri",            "~> 1.11.0.rc2", :require => false
+  end
 
   gem "adal",                "~> 1.0", :require => false
   gem "dotenv",              "~> 2.0", :require => false
diff --git a/blob/azure-storage-blob.gemspec b/blob/azure-storage-blob.gemspec
index 0caa8427e458481a355f83aa69d0c7592fc8ba7c..24893e1954976d9e11d0569a29d186b8318fc4bc 100644
--- a/blob/azure-storage-blob.gemspec
+++ b/blob/azure-storage-blob.gemspec
@@ -41,7 +41,11 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.3.0"
 
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
-  s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  if RUBY_VERSION < "2.4.0"
+    s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  else
+    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
+  end
 
   s.add_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")
diff --git a/common/azure-storage-common.gemspec b/common/azure-storage-common.gemspec
index 53afddb35b15bb1d4bb78db66b1c48943f3dc0db..2906823fc79a03bee7f7ea906695cab04f082b81 100644
--- a/common/azure-storage-common.gemspec
+++ b/common/azure-storage-common.gemspec
@@ -44,7 +44,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('faraday',                 '~> 1.0')
   s.add_runtime_dependency('faraday_middleware',      '~> 1.0.0.rc1')
   s.add_runtime_dependency("net-http-persistent",     '~> 4.0')
-  s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  if RUBY_VERSION < "2.4.0"
+    s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  else
+    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
+  end
 
   s.add_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")
diff --git a/file/azure-storage-file.gemspec b/file/azure-storage-file.gemspec
index 82f4a598387c99dae0844aeba38bc7cb6f13d522..71a5a317089227c3eaa1a8dd554b3c986162a573 100644
--- a/file/azure-storage-file.gemspec
+++ b/file/azure-storage-file.gemspec
@@ -41,7 +41,11 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.3.0"
 
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
-  s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  if RUBY_VERSION < "2.4.0"
+    s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  else
+    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
+  end
 
   s.add_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")
diff --git a/queue/azure-storage-queue.gemspec b/queue/azure-storage-queue.gemspec
index 703eaaf4e4beba67d5bf13c330c258a808c0d91a..d6d61b0a3a4ebb6654a3f48ac90a68a61e69b0f1 100644
--- a/queue/azure-storage-queue.gemspec
+++ b/queue/azure-storage-queue.gemspec
@@ -41,7 +41,11 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.3.0"
 
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
-  s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  if RUBY_VERSION < "2.4.0"
+    s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  else
+    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
+  end
 
   s.add_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")
diff --git a/table/azure-storage-table.gemspec b/table/azure-storage-table.gemspec
index dcd80c8747d0ab4ef956dcab0092c92575d76b40..21385fcdd46a48ea0ec442cac029df04869a5d1a 100644
--- a/table/azure-storage-table.gemspec
+++ b/table/azure-storage-table.gemspec
@@ -41,7 +41,11 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.3.0"
 
   s.add_runtime_dependency("azure-storage-common",    "~> 2.0")
-  s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  if RUBY_VERSION < "2.4.0"
+    s.add_runtime_dependency("nokogiri",                "~> 1.10.4")
+  else
+    s.add_runtime_dependency("nokogiri",                "~> 1.11.0.rc2")
+  end
 
   s.add_development_dependency("dotenv",              "~> 2.0")
   s.add_development_dependency("minitest",            "~> 5")