diff --git a/tests/reftests/Makefile.am b/tests/reftests/Makefile.am
index 9a0a8f1b70..0a5b7b4dec 100644
--- a/tests/reftests/Makefile.am
+++ b/tests/reftests/Makefile.am
@@ -32,6 +32,9 @@ EXTRA_DIST += \
 	border-image-balls.png \
 	border-image-3-balls-green.png \
 	border-image-3-balls-yellow.png \
+	border-image-excess-size.css \
+	border-image-excess-size.ref.ui \
+	border-image-excess-size.ui \
 	border-image-gradient.css \
 	border-image-gradient.ref.ui \
 	border-image-gradient.ui \
diff --git a/tests/reftests/border-image-excess-size.css b/tests/reftests/border-image-excess-size.css
new file mode 100644
index 0000000000..80af2b56fe
--- /dev/null
+++ b/tests/reftests/border-image-excess-size.css
@@ -0,0 +1,16 @@
+* {
+  engine: none;
+  border-image: url("green-20x20.png") 5000;
+  background-image: none;
+  background-color: #000;
+  border-style: solid;
+  border-width: 1;
+  padding: 0;
+  border-radius: 0;
+}
+
+GtkGrid * {
+  background-color: green;
+  border-style: none;
+  border-width: 0;
+}
diff --git a/tests/reftests/border-image-excess-size.ref.ui b/tests/reftests/border-image-excess-size.ref.ui
new file mode 100644
index 0000000000..488d6976d1
--- /dev/null
+++ b/tests/reftests/border-image-excess-size.ref.ui
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+    <child>
+      <object class="GtkGrid" id="grid1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="row_spacing">8</property>
+        <property name="column_spacing">8</property>
+        <child>
+          <object class="GtkToolbar" id="toolbar1">
+            <property name="width_request">1</property>
+            <property name="height_request">1</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="show_arrow">False</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolbar" id="toolbar2">
+            <property name="width_request">1</property>
+            <property name="height_request">1</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="show_arrow">False</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolbar" id="toolbar3">
+            <property name="width_request">1</property>
+            <property name="height_request">1</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="show_arrow">False</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkToolbar" id="toolbar4">
+            <property name="width_request">1</property>
+            <property name="height_request">1</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="show_arrow">False</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/tests/reftests/border-image-excess-size.ui b/tests/reftests/border-image-excess-size.ui
new file mode 100644
index 0000000000..43bbfc7c52
--- /dev/null
+++ b/tests/reftests/border-image-excess-size.ui
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <property name="type">popup</property>
+    <child>
+      <object class="GtkToolbar" id="toolbar1">
+        <property name="width_request">10</property>
+        <property name="height_request">10</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="show_arrow">False</property>
+      </object>
+    </child>
+  </object>
+</interface>