matplotlib
diff --git a/‎lib/matplotlib/tests/baseline_images/test_plot_types/scatter.pdf renamed to ‎lib/matplotlib/tests/baseline_images/test_axes/scatter.pdf b/‎lib/matplotlib/tests/baseline_images/test_plot_types/scatter.pdf renamed to ‎lib/matplotlib/tests/baseline_images/test_axes/scatter.pdf
diff --git a/‎lib/matplotlib/tests/baseline_images/test_plot_types/scatter.png renamed to ‎lib/matplotlib/tests/baseline_images/test_axes/scatter.png b/‎lib/matplotlib/tests/baseline_images/test_plot_types/scatter.png renamed to ‎lib/matplotlib/tests/baseline_images/test_axes/scatter.png
diff --git a/‎lib/matplotlib/tests/baseline_images/test_plot_types/scatter.svg renamed to ‎lib/matplotlib/tests/baseline_images/test_axes/scatter.svg b/‎lib/matplotlib/tests/baseline_images/test_plot_types/scatter.svg renamed to ‎lib/matplotlib/tests/baseline_images/test_axes/scatter.svg
diff --git a/‎lib/matplotlib/tests/test_axes.py
+8 b/‎lib/matplotlib/tests/test_axes.py
+8
diff --git a/‎lib/matplotlib/tests/test_plot_types.py
-15 b/‎lib/matplotlib/tests/test_plot_types.py
-15
@@ -650,6 +650,7 @@ def test_marker_edges():
     ax.set_xticks([])
     ax.set_yticks([])
 
+<<<<<<< HEAD
 @image_comparison(baseline_images=['hist_log'])
 def test_hist_log():
     data0 = np.linspace(0,1,200)**3
@@ -697,6 +698,13 @@ def test_hist2d_transpose():
     ax = fig.add_subplot(111)
     ax.hist2d(x,y,bins=10)
 
+
+@image_comparison(baseline_images=['scatter'])
+def test_scatter_plot():
+    ax = plt.axes()
+    ax.scatter([3, 4, 2, 6], [2, 5, 2, 3], c=['r', 'y', 'b', 'lime'], s=[24, 15, 19, 29])
+
+
 if __name__=='__main__':
     import nose
     nose.runmodule(argv=['-s','--with-doctest'], exit=False)