diff --git a/components/style/stylesheets.rs b/components/style/stylesheets.rs
index 65368452665b..a4eac87ce844 100644
--- a/components/style/stylesheets.rs
+++ b/components/style/stylesheets.rs
@@ -429,7 +429,11 @@ impl<'a, 'b> AtRuleParser for NestedRuleParser<'a, 'b> {
                 Ok(AtRuleType::WithBlock(AtRulePrelude::FontFace))
             },
             "viewport" => {
-                Ok(AtRuleType::WithBlock(AtRulePrelude::Viewport))
+                if ::util::opts::experimental_enabled() {
+                    Ok(AtRuleType::WithBlock(AtRulePrelude::Viewport))
+                } else {
+                    Err(())
+                }
             }
             _ => Err(())
         }
diff --git a/tests/unit/style/viewport.rs b/tests/unit/style/viewport.rs
index fe72f27dc3d2..6be92ea24fd9 100644
--- a/tests/unit/style/viewport.rs
+++ b/tests/unit/style/viewport.rs
@@ -25,6 +25,8 @@ fn test_viewport_rule<F>(css: &str,
                          callback: F)
     where F: Fn(&Vec<ViewportDescriptorDeclaration>, &str)
 {
+    ::util::opts::set_experimental_enabled(true);
+
     let stylesheet = stylesheet!(css, Author);
     let mut rule_count = 0;
     for rule in stylesheet.effective_rules(&device).viewport() {