diff --git a/src/lib.rs b/src/lib.rs
index bf254697..28fa8f04 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -759,6 +759,29 @@ mod tests {
     "#},
     );
 
+    test(
+      r#"
+      .foo {
+        border: 1px solid currentColor;
+      }
+    "#,
+      indoc! {r#"
+      .foo {
+        border: 1px solid;
+      }
+    "#
+      },
+    );
+
+    minify_test(
+      r#"
+      .foo {
+        border: 1px solid currentColor;
+      }
+    "#,
+      ".foo{border:1px solid}",
+    );
+
     prefix_test(
       r#"
       .foo {
diff --git a/src/properties/border.rs b/src/properties/border.rs
index e9e2dc9b..bf5f7bb0 100644
--- a/src/properties/border.rs
+++ b/src/properties/border.rs
@@ -162,13 +162,13 @@ impl<S: ToCss + Default + PartialEq> ToCss for GenericBorder<S> {
 
     if self.width != BorderSideWidth::default() {
       self.width.to_css(dest)?;
-      dest.write_str(" ")?;
     }
     if self.style != S::default() {
-      self.style.to_css(dest)?;
       dest.write_str(" ")?;
+      self.style.to_css(dest)?;
     }
     if self.color != CssColor::current_color() {
+      dest.write_str(" ")?;
       self.color.to_css(dest)?;
     }
     Ok(())