diff --git a/defaults/main.yml b/defaults/main.yml
index 85205d3..61548a3 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -5,3 +5,5 @@ generate_keypair: no
 generate_keypair_folder: /tmp
 generate_keypair_key_type: rsa
 generate_keypair_key_bits: 2048
+download_image_dest: /tmp
+download_image_force: no
diff --git a/tasks/create_image.yml b/tasks/create_image.yml
index b2a2a9e..e2a7cea 100644
--- a/tasks/create_image.yml
+++ b/tasks/create_image.yml
@@ -1,4 +1,14 @@
 ---
+- block:
+    - os_image_facts:
+        cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
+        image: "{{ item_image.name }}"
+    - get_url:
+        url: "{{ item_image.download_image_url }}"
+        dest: "{{ item_image.download_image_dest|default(download_image_dest) }}"
+        force: "{{ item_image.download_image_force|default(download_image_force) }}"
+      when: not openstack_image
+  when: item_image.download_image_url is defined
 - os_image:
     cloud: "{{ item_cloud.oscc_cloud|default(item_cloud.name) }}"
     state: "{{ item_image.state|default(omit) }}"
diff --git a/tests/resources.yml b/tests/resources.yml
index 80b2cd8..d3fc297 100644
--- a/tests/resources.yml
+++ b/tests/resources.yml
@@ -19,6 +19,11 @@ clouds:
     profiles:
       - test_profile_a
       - test_profile_b
+    images:
+      - name: test_image
+        download_image_url: "file:///opt/stack/cache/files/cirros-0.3.4-x86_64-disk.img"
+        download_image_dest: /tmp/test_image.img
+        filename: /tmp/test_image.img
     servers:
       - name: test_server_a
         image: cirros-0.3.4-x86_64-uec
diff --git a/tests/test.yaml b/tests/test.yaml
index c0c21c5..404f4b9 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -53,6 +53,14 @@
     - name: Assert test-server-a server has been created
       assert: { that: result.rc == 0 }
 
+    - name: Querying for test_image image
+      command: openstack --os-cloud devstack-admin image show test_image
+      register: result
+      changed_when: False
+
+    - name: Assert test_image server has been created
+      assert: { that: result.rc == 0 }
+
     - name: Querying for test_server_b server
       command: openstack --os-cloud devstack server show test_server_b
       register: result