diff --git a/.ci/kitchen-amazon2-py2 b/.ci/kitchen-amazon2-py2
index 22544b78ae73..a3bc34a297a9 100644
--- a/.ci/kitchen-amazon2-py2
+++ b/.ci/kitchen-amazon2-py2
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-amazon2-py3 b/.ci/kitchen-amazon2-py3
index 646941e87e07..ff508d3d030d 100644
--- a/.ci/kitchen-amazon2-py3
+++ b/.ci/kitchen-amazon2-py3
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-centos6-py2 b/.ci/kitchen-centos6-py2
index bed09e34b81a..98bfb68c8aed 100644
--- a/.ci/kitchen-centos6-py2
+++ b/.ci/kitchen-centos6-py2
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-centos7-py2 b/.ci/kitchen-centos7-py2
index a3c1c7be9810..e64e1ffd6586 100644
--- a/.ci/kitchen-centos7-py2
+++ b/.ci/kitchen-centos7-py2
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-centos7-py2-tcp b/.ci/kitchen-centos7-py2-tcp
index 1dc3c41e1f88..b742feaadf83 100644
--- a/.ci/kitchen-centos7-py2-tcp
+++ b/.ci/kitchen-centos7-py2-tcp
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3
index 29e5b8fc6b84..d6094f37e5af 100644
--- a/.ci/kitchen-centos7-py3
+++ b/.ci/kitchen-centos7-py3
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-centos7-py3-tcp b/.ci/kitchen-centos7-py3-tcp
index 04dc5eb1607f..daba37d78a08 100644
--- a/.ci/kitchen-centos7-py3-tcp
+++ b/.ci/kitchen-centos7-py3-tcp
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-debian8-py2 b/.ci/kitchen-debian8-py2
index e11fde0ac82d..9a0fe07faacb 100644
--- a/.ci/kitchen-debian8-py2
+++ b/.ci/kitchen-debian8-py2
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-debian8-py3 b/.ci/kitchen-debian8-py3
index 4c71d86dc1cc..43ec963b9e69 100644
--- a/.ci/kitchen-debian8-py3
+++ b/.ci/kitchen-debian8-py3
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-debian9-py2 b/.ci/kitchen-debian9-py2
index 5b25ca421a26..1288dd047f4e 100644
--- a/.ci/kitchen-debian9-py2
+++ b/.ci/kitchen-debian9-py2
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-debian9-py3 b/.ci/kitchen-debian9-py3
index 6ef6280a130e..f863dc4cf16f 100644
--- a/.ci/kitchen-debian9-py3
+++ b/.ci/kitchen-debian9-py3
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-fedora29-py2 b/.ci/kitchen-fedora29-py2
index 39a17b9a7664..9232163c87fb 100644
--- a/.ci/kitchen-fedora29-py2
+++ b/.ci/kitchen-fedora29-py2
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-fedora29-py3 b/.ci/kitchen-fedora29-py3
index e655444239e3..543189af6154 100644
--- a/.ci/kitchen-fedora29-py3
+++ b/.ci/kitchen-fedora29-py3
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-ubuntu1604-py2 b/.ci/kitchen-ubuntu1604-py2
index afa31304bf50..07256109ae88 100644
--- a/.ci/kitchen-ubuntu1604-py2
+++ b/.ci/kitchen-ubuntu1604-py2
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-ubuntu1604-py2-tcp b/.ci/kitchen-ubuntu1604-py2-tcp
index 9c51f84d2572..bc7a6b9c92ef 100644
--- a/.ci/kitchen-ubuntu1604-py2-tcp
+++ b/.ci/kitchen-ubuntu1604-py2-tcp
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-ubuntu1604-py3 b/.ci/kitchen-ubuntu1604-py3
index 7f2c8cd4ea08..0feb96855f49 100644
--- a/.ci/kitchen-ubuntu1604-py3
+++ b/.ci/kitchen-ubuntu1604-py3
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-ubuntu1604-py3-tcp b/.ci/kitchen-ubuntu1604-py3-tcp
index 2b3f845f2014..9a9ff87e0ddb 100644
--- a/.ci/kitchen-ubuntu1604-py3-tcp
+++ b/.ci/kitchen-ubuntu1604-py3-tcp
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-ubuntu1804-py2 b/.ci/kitchen-ubuntu1804-py2
index 8e3c2537ca93..66df539fd948 100644
--- a/.ci/kitchen-ubuntu1804-py2
+++ b/.ci/kitchen-ubuntu1804-py2
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-ubuntu1804-py3 b/.ci/kitchen-ubuntu1804-py3
index 8184cd76dd3a..3eca715225e3 100644
--- a/.ci/kitchen-ubuntu1804-py3
+++ b/.ci/kitchen-ubuntu1804-py3
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-windows2016-py2 b/.ci/kitchen-windows2016-py2
index 298ef53b0943..99ddce189d9b 100644
--- a/.ci/kitchen-windows2016-py2
+++ b/.ci/kitchen-windows2016-py2
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",
diff --git a/.ci/kitchen-windows2016-py3 b/.ci/kitchen-windows2016-py3
index 74ca37e91334..550043eddd71 100644
--- a/.ci/kitchen-windows2016-py3
+++ b/.ci/kitchen-windows2016-py3
@@ -43,7 +43,7 @@ wrappedNode('kitchen-slave', global_timeout, '#jenkins-prod-pr') {
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "CODECOV_FLAGS=${distro_name}${distro_version},${python_version},${test_transport.toLowerCase()}",
         'PATH=~/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin',
-        'RBENV_VERSION=2.4.2',
+        'RBENV_VERSION=2.6.3',
         "TEST_SUITE=${python_version}",
         "TEST_PLATFORM=${distro_name}-${distro_version}",
         "TEST_TRANSPORT=${test_transport}",