diff --git a/README.rst b/README.rst
index 02da35d..e857f25 100644
--- a/README.rst
+++ b/README.rst
@@ -47,11 +47,11 @@ Sample pillars
         storage:
           engine: file
         images:
-        - name: "CirrOS 0.3.1"
+        - name: "CirrOS"
           format: qcow2
-          file: cirros-0.3.1-x86_64-disk.img
-          source: http://cdn.download.cirros-cloud.net/0.3.1/cirros-0.3.1-x86_64-disk.img
-          public: true
+          file: cirros-0.4.0-x86_64-disk.img
+          source: https://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
+          visibility: true
         audit:
           enabled: false
         api_limit_max: 100
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index 6a2779c..8755d7d 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -37,3 +37,15 @@ glance:
     policy:
       publicize_image: "role:admin"
       add_member:
+    images:
+        - name: "CirrOS"
+          format: qcow2
+          file: cirros-0.4.0-x86_64-disk.img
+          source: https://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
+          visibility: true
+        - name: "CirrOS4"
+          format: qcow2
+          file: cirros-0.4.0-x86_64-disk.img
+          source: https://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
+          # TODO:  for backward compatibility, test public option.
+          public: true