diff --git a/_config/tests.yml b/_config/tests.yml
index 7055dba92..bed956221 100644
--- a/_config/tests.yml
+++ b/_config/tests.yml
@@ -9,6 +9,7 @@ SilverStripe\Core\Injector\Injector:
         extensions: '%$SilverStripe\Dev\State\ExtensionTestState'
         flushable: '%$SilverStripe\Dev\State\FlushableTestState'
         requirements: '%$SilverStripe\View\Dev\RequirementsTestState'
+        ssviewer: '%$SilverStripe\View\Dev\SSViewerTestState'
 ---
 Name: kerneltest
 Before: '*'
diff --git a/src/Control/ContentNegotiator.php b/src/Control/ContentNegotiator.php
index d1c67732c..3f3280919 100644
--- a/src/Control/ContentNegotiator.php
+++ b/src/Control/ContentNegotiator.php
@@ -39,35 +39,29 @@ class ContentNegotiator
 
     /**
      * @config
-     *
      * @var string
      */
     private static $content_type = '';
 
     /**
      * @config
-     *
      * @var string
      */
     private static $encoding = 'utf-8';
 
     /**
      * @config
-     *
      * @var bool
      */
     private static $enabled = false;
-    
+
     /**
-     * @config
-     *
      * @var bool
      */
     protected static $current_enabled = null;
 
     /**
      * @config
-     *
      * @var string
      */
     private static $default_format = 'html';
@@ -97,7 +91,7 @@ class ContentNegotiator
             return (substr($response->getBody(), 0, 5) == '<' . '?xml');
         }
     }
-    
+
     /**
      * Gets the current enabled status, if it is not set this will fallback to config
      *
@@ -110,7 +104,7 @@ class ContentNegotiator
         }
         return Config::inst()->get(static::class, 'enabled');
     }
-    
+
     /**
      * Sets the current enabled status
      *
diff --git a/src/View/Dev/SSViewerTestState.php b/src/View/Dev/SSViewerTestState.php
new file mode 100644
index 000000000..56f946e46
--- /dev/null
+++ b/src/View/Dev/SSViewerTestState.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace SilverStripe\View\Dev;
+
+use SilverStripe\Control\ContentNegotiator;
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\Dev\State\TestState;
+use SilverStripe\View\SSViewer;
+
+class SSViewerTestState implements TestState
+{
+    public function setUp(SapphireTest $test)
+    {
+        SSViewer::set_themes(null);
+        SSViewer::setRewriteHashLinksDefault(null);
+        ContentNegotiator::setEnabled(null);
+    }
+
+    public function tearDown(SapphireTest $test)
+    {
+    }
+
+    public function setUpOnce($class)
+    {
+    }
+
+    public function tearDownOnce($class)
+    {
+    }
+}