diff --git a/skimage/data/__init__.py b/skimage/data/__init__.py
index 864e3638..826ae75a 100644
--- a/skimage/data/__init__.py
+++ b/skimage/data/__init__.py
@@ -184,3 +184,18 @@ def chelsea():
 
     """
     return load("chelsea.png")
+
+
+def coffee():
+    """Coffee cup.
+
+    An example with several shapes (including an ellipse). The background
+    is composed of stripes.
+
+    Notes
+    -----
+    This image was downloaded on
+    `Flickr <https://secure.flickr.com/photos/free-stock/4999821195/sizes/o/in/photostream/>`__
+    No copyright restrictions.
+    """
+    return load("coffee.png")
diff --git a/skimage/data/coffee.png b/skimage/data/coffee.png
new file mode 100644
index 00000000..d7f38a30
Binary files /dev/null and b/skimage/data/coffee.png differ
diff --git a/skimage/data/tests/test_data.py b/skimage/data/tests/test_data.py
index 94fe3a5e..49cd4b5a 100644
--- a/skimage/data/tests/test_data.py
+++ b/skimage/data/tests/test_data.py
@@ -44,6 +44,11 @@ def test_chelsea():
     data.chelsea()
 
 
+def test_coffee():
+    """ Test that "coffee" image can be loaded. """
+    data.coffee()
+
+
 if __name__ == "__main__":
     from numpy.testing import run_module_suite
     run_module_suite()