diff --git a/tests/unit/style/parsing/border.rs b/tests/unit/style/parsing/border.rs
new file mode 100644
index 000000000000..0739cb0eb786
--- /dev/null
+++ b/tests/unit/style/parsing/border.rs
@@ -0,0 +1,88 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use cssparser::Parser;
+use media_queries::CSSErrorReporterTest;
+use style::parser::ParserContext;
+use style::properties::longhands::{border_image_outset, border_image_repeat, border_image_slice};
+use style::properties::longhands::{border_image_source, border_image_width};
+use style::properties::shorthands::border_image;
+use style::stylesheets::Origin;
+use url::Url;
+
+#[test]
+fn border_image_shorhand_should_parse_when_all_properties_specified() {
+    let url = Url::parse("http://localhost").unwrap();
+    let context = ParserContext::new(Origin::Author, &url, Box::new(CSSErrorReporterTest));
+    let mut parser = Parser::new("linear-gradient(red, blue) 30 30% 45 fill / 20px 40px / 10px \
+                                 round stretch");
+    let result = border_image::parse_value(&context, &mut parser).unwrap();
+
+    assert_eq!(result.border_image_source.unwrap(),
+               parse_longhand!(border_image_source, "linear-gradient(red, blue)"));
+    assert_eq!(result.border_image_slice.unwrap(), parse_longhand!(border_image_slice, "30 30% 45 fill"));
+    assert_eq!(result.border_image_width.unwrap(), parse_longhand!(border_image_width, "20px 40px"));
+    assert_eq!(result.border_image_outset.unwrap(), parse_longhand!(border_image_outset, "10px"));
+    assert_eq!(result.border_image_repeat.unwrap(), parse_longhand!(border_image_repeat, "round stretch"));
+}
+
+#[test]
+fn border_image_shorhand_should_parse_without_width() {
+    let url = Url::parse("http://localhost").unwrap();
+    let context = ParserContext::new(Origin::Author, &url, Box::new(CSSErrorReporterTest));
+    let mut parser = Parser::new("linear-gradient(red, blue) 30 30% 45 fill / / 10px round stretch");
+    let result = border_image::parse_value(&context, &mut parser).unwrap();
+
+    assert_eq!(result.border_image_source.unwrap(),
+               parse_longhand!(border_image_source, "linear-gradient(red, blue)"));
+    assert_eq!(result.border_image_slice.unwrap(), parse_longhand!(border_image_slice, "30 30% 45 fill"));
+    assert_eq!(result.border_image_outset.unwrap(), parse_longhand!(border_image_outset, "10px"));
+    assert_eq!(result.border_image_repeat.unwrap(), parse_longhand!(border_image_repeat, "round stretch"));
+    assert_eq!(result.border_image_width.unwrap(), border_image_width::get_initial_specified_value());
+}
+
+#[test]
+fn border_image_shorhand_should_parse_without_outset() {
+    let url = Url::parse("http://localhost").unwrap();
+    let context = ParserContext::new(Origin::Author, &url, Box::new(CSSErrorReporterTest));
+    let mut parser = Parser::new("linear-gradient(red, blue) 30 30% 45 fill / 20px 40px round");
+    let result = border_image::parse_value(&context, &mut parser).unwrap();
+
+    assert_eq!(result.border_image_source.unwrap(),
+               parse_longhand!(border_image_source, "linear-gradient(red, blue)"));
+    assert_eq!(result.border_image_slice.unwrap(), parse_longhand!(border_image_slice, "30 30% 45 fill"));
+    assert_eq!(result.border_image_width.unwrap(), parse_longhand!(border_image_width, "20px 40px"));
+    assert_eq!(result.border_image_repeat.unwrap(), parse_longhand!(border_image_repeat, "round"));
+    assert_eq!(result.border_image_outset.unwrap(), border_image_outset::get_initial_specified_value());
+}
+
+#[test]
+fn border_image_shorhand_should_parse_without_width_or_outset() {
+    let url = Url::parse("http://localhost").unwrap();
+    let context = ParserContext::new(Origin::Author, &url, Box::new(CSSErrorReporterTest));
+    let mut parser = Parser::new("linear-gradient(red, blue) 30 30% 45 fill round");
+    let result = border_image::parse_value(&context, &mut parser).unwrap();
+
+    assert_eq!(result.border_image_source.unwrap(),
+               parse_longhand!(border_image_source, "linear-gradient(red, blue)"));
+    assert_eq!(result.border_image_slice.unwrap(), parse_longhand!(border_image_slice, "30 30% 45 fill"));
+    assert_eq!(result.border_image_repeat.unwrap(), parse_longhand!(border_image_repeat, "round"));
+    assert_eq!(result.border_image_width.unwrap(), border_image_width::get_initial_specified_value());
+    assert_eq!(result.border_image_outset.unwrap(), border_image_outset::get_initial_specified_value());
+}
+
+#[test]
+fn border_image_shorhand_should_parse_with_just_source() {
+    let url = Url::parse("http://localhost").unwrap();
+    let context = ParserContext::new(Origin::Author, &url, Box::new(CSSErrorReporterTest));
+    let mut parser = Parser::new("linear-gradient(red, blue)");
+    let result = border_image::parse_value(&context, &mut parser).unwrap();
+
+    assert_eq!(result.border_image_source.unwrap(),
+               parse_longhand!(border_image_source, "linear-gradient(red, blue)"));
+    assert_eq!(result.border_image_slice.unwrap(), border_image_slice::get_initial_specified_value());
+    assert_eq!(result.border_image_width.unwrap(), border_image_width::get_initial_specified_value());
+    assert_eq!(result.border_image_outset.unwrap(), border_image_outset::get_initial_specified_value());
+    assert_eq!(result.border_image_repeat.unwrap(), border_image_repeat::get_initial_specified_value());
+}
diff --git a/tests/unit/style/parsing/mod.rs b/tests/unit/style/parsing/mod.rs
index f2fed25b7fd2..47a52d470f64 100644
--- a/tests/unit/style/parsing/mod.rs
+++ b/tests/unit/style/parsing/mod.rs
@@ -62,6 +62,7 @@ macro_rules! parse_longhand {
 }
 
 mod basic_shape;
+mod border;
 mod font;
 mod image;
 mod inherited_text;