diff --git a/examples/connect.py b/examples/connect.py
index fe6ebd026..b4e76cef2 100644
--- a/examples/connect.py
+++ b/examples/connect.py
@@ -47,7 +47,7 @@ def _get_resource_value(resource_key, default):
 
 
 SERVER_NAME = 'openstacksdk-example'
-IMAGE_NAME = _get_resource_value('image_name', 'cirros-0.3.5-x86_64-disk')
+IMAGE_NAME = _get_resource_value('image_name', 'cirros-0.3.6-x86_64-disk')
 FLAVOR_NAME = _get_resource_value('flavor_name', 'm1.small')
 NETWORK_NAME = _get_resource_value('network_name', 'private')
 KEYPAIR_NAME = _get_resource_value('keypair_name', 'openstacksdk-example')
diff --git a/openstack/tests/functional/base.py b/openstack/tests/functional/base.py
index 911d2ebe0..115242615 100644
--- a/openstack/tests/functional/base.py
+++ b/openstack/tests/functional/base.py
@@ -39,7 +39,7 @@ def _disable_keep_alive(conn):
     sess.keep_alive = False
 
 
-IMAGE_NAME = _get_resource_value('image_name', 'cirros-0.3.5-x86_64-disk')
+IMAGE_NAME = _get_resource_value('image_name', 'cirros-0.3.6-x86_64-disk')
 FLAVOR_NAME = _get_resource_value('flavor_name', 'm1.small')
 
 
diff --git a/openstack/tests/functional/cloud/test_clustering.py b/openstack/tests/functional/cloud/test_clustering.py
index 4825e6142..07c3a7444 100644
--- a/openstack/tests/functional/cloud/test_clustering.py
+++ b/openstack/tests/functional/cloud/test_clustering.py
@@ -116,7 +116,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -146,7 +146,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -190,7 +190,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -233,7 +233,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -319,7 +319,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -393,7 +393,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -475,7 +475,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -568,7 +568,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -657,7 +657,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -714,7 +714,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -776,7 +776,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -864,7 +864,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -915,7 +915,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -1019,7 +1019,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -1057,7 +1057,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -1095,7 +1095,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -1131,7 +1131,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -1298,7 +1298,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
@@ -1357,7 +1357,7 @@ class TestClustering(base.BaseFunctionalTest):
         spec = {
             "properties": {
                 "flavor": "m1.tiny",
-                "image": "cirros-0.3.5-x86_64-disk",
+                "image": "cirros-0.3.6-x86_64-disk",
                 "networks": [
                     {
                         "network": "private"
diff --git a/requirements.txt b/requirements.txt
index 78f758519..87ed65edb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,5 +18,5 @@ futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
 iso8601>=0.1.11 # MIT
 netifaces>=0.10.4 # MIT
 
-dogpile.cache>=0.6.2 # BSD
+dogpile.cache>=0.6.2,<0.7.0 # BSD
 cryptography>=2.1 # BSD/Apache-2.0