diff --git a/tests/reftests/Makefile.am b/tests/reftests/Makefile.am
index 27f0cf58dc..d133e00626 100644
--- a/tests/reftests/Makefile.am
+++ b/tests/reftests/Makefile.am
@@ -61,6 +61,9 @@ EXTRA_DIST += \
 	border-radius-clamp.css\
 	border-radius-clamp.ref.ui \
 	border-radius-clamp.ui \
+	border-style.css \
+	border-style.ref.ui \
+	border-style.ui \
 	border-style-none.css \
 	border-style-none.ref.ui \
 	border-style-none.ui \
diff --git a/tests/reftests/border-style.css b/tests/reftests/border-style.css
new file mode 100644
index 0000000000..da287318c4
--- /dev/null
+++ b/tests/reftests/border-style.css
@@ -0,0 +1,27 @@
+@import url("reset-to-defaults.css");
+
+GtkButton {
+  background-color: red;
+  border-color: green;
+  border-width: 1;
+}
+
+.button-top-left {
+  border-style: solid none none solid;
+}
+
+.button-top-right {
+  border-style: solid solid none none;
+}
+
+.button-bottom-left {
+  border-style: none none solid solid;
+}
+
+.button-bottom-right {
+  border-style: none solid solid none;
+}
+
+.button-border {
+  border-style: solid;
+}
diff --git a/tests/reftests/border-style.ref.ui b/tests/reftests/border-style.ref.ui
new file mode 100644
index 0000000000..904e6a9a6b
--- /dev/null
+++ b/tests/reftests/border-style.ref.ui
@@ -0,0 +1,33 @@
+<?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>
+        <child>
+          <object class="GtkButton" id="button1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
+            <property name="width_request">40</property>
+            <property name="height_request">40</property>
+            <style>
+              <class name="button-border"/>
+            </style>
+          </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>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/tests/reftests/border-style.ui b/tests/reftests/border-style.ui
new file mode 100644
index 0000000000..a1778a2fb3
--- /dev/null
+++ b/tests/reftests/border-style.ui
@@ -0,0 +1,90 @@
+<?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>
+        <child>
+          <object class="GtkButton" id="button1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
+            <style>
+              <class name="button-top-left"/>
+            </style>
+          </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="GtkButton" id="button2">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
+            <style>
+              <class name="button-top-right"/>
+            </style>
+          </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="GtkButton" id="button3">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
+            <style>
+              <class name="button-bottom-left"/>
+            </style>
+          </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>
+        <child>
+          <object class="GtkButton" id="button4">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="use_action_appearance">False</property>
+            <property name="width_request">20</property>
+            <property name="height_request">20</property>
+            <style>
+              <class name="button-bottom-right"/>
+            </style>
+          </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>
+      </object>
+    </child>
+  </object>
+</interface>