diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index e63665230ca..169c97595af 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -19,7 +19,6 @@ from homeassistant.const import (
     )
 
 from homeassistant.helpers.entity_component import EntityComponent
-import homeassistant.util.dt as dt_util
 
 
 DOMAIN = 'camera'
diff --git a/homeassistant/components/camera/demo.py b/homeassistant/components/camera/demo.py
index fd79bc3ce82..0ad992db86d 100644
--- a/homeassistant/components/camera/demo.py
+++ b/homeassistant/components/camera/demo.py
@@ -4,8 +4,8 @@ homeassistant.components.camera.demo
 Demo platform that has a fake camera.
 """
 import os
-from random import randint
 from homeassistant.components.camera import Camera
+import homeassistant.util.dt as dt_util
 
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
@@ -24,8 +24,10 @@ class DemoCamera(Camera):
 
     def camera_image(self):
         """ Return a faked still image response. """
+        now = dt_util.utcnow()
+
         image_path = os.path.join(os.path.dirname(__file__),
-                                  'demo_{}.png'.format(randint(1, 5)))
+                                  'demo_{}.jpg'.format(now.second % 4))
         with open(image_path, 'rb') as file:
             return file.read()
 
diff --git a/homeassistant/components/camera/demo_0.jpg b/homeassistant/components/camera/demo_0.jpg
new file mode 100644
index 00000000000..ff87d5179f8
Binary files /dev/null and b/homeassistant/components/camera/demo_0.jpg differ
diff --git a/homeassistant/components/camera/demo_1.jpg b/homeassistant/components/camera/demo_1.jpg
new file mode 100644
index 00000000000..06166fffa85
Binary files /dev/null and b/homeassistant/components/camera/demo_1.jpg differ
diff --git a/homeassistant/components/camera/demo_1.png b/homeassistant/components/camera/demo_1.png
deleted file mode 100644
index fc681fccecd..00000000000
Binary files a/homeassistant/components/camera/demo_1.png and /dev/null differ
diff --git a/homeassistant/components/camera/demo_2.jpg b/homeassistant/components/camera/demo_2.jpg
new file mode 100644
index 00000000000..71356479ab0
Binary files /dev/null and b/homeassistant/components/camera/demo_2.jpg differ
diff --git a/homeassistant/components/camera/demo_2.png b/homeassistant/components/camera/demo_2.png
deleted file mode 100644
index 255cd5c45d4..00000000000
Binary files a/homeassistant/components/camera/demo_2.png and /dev/null differ
diff --git a/homeassistant/components/camera/demo_3.jpg b/homeassistant/components/camera/demo_3.jpg
new file mode 100644
index 00000000000..06166fffa85
Binary files /dev/null and b/homeassistant/components/camera/demo_3.jpg differ
diff --git a/homeassistant/components/camera/demo_3.png b/homeassistant/components/camera/demo_3.png
deleted file mode 100644
index b54c1ffb57c..00000000000
Binary files a/homeassistant/components/camera/demo_3.png and /dev/null differ
diff --git a/homeassistant/components/camera/demo_4.png b/homeassistant/components/camera/demo_4.png
deleted file mode 100644
index 4be36ee42d0..00000000000
Binary files a/homeassistant/components/camera/demo_4.png and /dev/null differ
diff --git a/homeassistant/components/camera/demo_5.png b/homeassistant/components/camera/demo_5.png
deleted file mode 100644
index 874b95ef6a5..00000000000
Binary files a/homeassistant/components/camera/demo_5.png and /dev/null differ