diff --git a/docs/NEWS b/docs/NEWS
index e0ed4ec9..0ff071d9 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -1,4 +1,4 @@
-Version 2.1 (November 28th, 2016)
+Version 2.1 ()
 ------------------------------------------------------------------------
 
     * Allow to set a default category for authors (personal preferences)
@@ -15,6 +15,8 @@ Version 2.1 (November 28th, 2016)
     * [Security] For multi-deletion of entries, secure the HTTP referrer
       output to prevent XSS (Issue #435)
 
+    * Disabled Selenium test files unless enabled
+
 Version 2.1-beta2 (September 26th, 2016)
 ------------------------------------------------------------------------
     * Improved backend accessibility by hiding iconfont icons for
diff --git a/tests/coverage/append.php b/tests/coverage/append.php
index cf05a534..c43d939f 100644
--- a/tests/coverage/append.php
+++ b/tests/coverage/append.php
@@ -1,4 +1,8 @@
 <?php
+if (!isset($GLOBALS['S9Y_SELENIUM_ENABLED'])) {
+  die('Selenium disabled.');
+}
+
 if ( isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) &&
     !isset($_GET['PHPUNIT_SELENIUM_TEST_ID']) &&
     extension_loaded('xdebug')) {
diff --git a/tests/coverage/phpunit_coverage.php b/tests/coverage/phpunit_coverage.php
index 857c5339..aeaffd4d 100644
--- a/tests/coverage/phpunit_coverage.php
+++ b/tests/coverage/phpunit_coverage.php
@@ -1,4 +1,8 @@
 <?php
+if (!isset($GLOBALS['S9Y_SELENIUM_ENABLED'])) {
+  die('Selenium disabled.');
+}
+
 require_once 'PHPUnit/Util/FilterIterator.php';
 
 if (isset($_GET['PHPUNIT_SELENIUM_TEST_ID'])) {
diff --git a/tests/coverage/prepend.php b/tests/coverage/prepend.php
index 453e68f6..49b36042 100644
--- a/tests/coverage/prepend.php
+++ b/tests/coverage/prepend.php
@@ -1,4 +1,8 @@
 <?php
+if (!isset($GLOBALS['S9Y_SELENIUM_ENABLED'])) {
+  die('Selenium disabled.');
+}
+
 if ( isset($_COOKIE['PHPUNIT_SELENIUM_TEST_ID']) &&
     !isset($_GET['PHPUNIT_SELENIUM_TEST_ID']) &&
     extension_loaded('xdebug')) {