diff --git a/components/style/properties/shorthand/outline.mako.rs b/components/style/properties/shorthand/outline.mako.rs
index 25757c28a2d..30c585f65b5 100644
--- a/components/style/properties/shorthand/outline.mako.rs
+++ b/components/style/properties/shorthand/outline.mako.rs
@@ -68,6 +68,7 @@
     for corner in ['topleft', 'topright', 'bottomright', 'bottomleft']
 )}" products="gecko" spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-outline-radius)">
     use properties::shorthands;
+    use values::specified::basic_shape::serialize_radius_values;
 
     pub fn parse_value(context: &ParserContext, input: &mut Parser) -> Result<Longhands, ()> {
         // Re-use border-radius parsing.
@@ -80,19 +81,14 @@
         })
     }
 
-    // TODO: Border radius for the radius shorthand is not implemented correctly yet
     impl<'a> ToCss for LonghandsToSerialize<'a>  {
         fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
-            try!(self._moz_outline_radius_topleft.to_css(dest));
-            try!(write!(dest, " "));
-
-            try!(self._moz_outline_radius_topright.to_css(dest));
-            try!(write!(dest, " "));
-
-            try!(self._moz_outline_radius_bottomright.to_css(dest));
-            try!(write!(dest, " "));
-
-            self._moz_outline_radius_bottomleft.to_css(dest)
+            serialize_radius_values(dest,
+                &self._moz_outline_radius_topleft.0,
+                &self._moz_outline_radius_topright.0,
+                &self._moz_outline_radius_bottomright.0,
+                &self._moz_outline_radius_bottomleft.0,
+            )
         }
     }
 </%helpers:shorthand>