diff --git a/src/chrome/content/rules/ClearChain.com.xml b/src/chrome/content/rules/ClearChain.com.xml
new file mode 100644
index 000000000000..a4a04de6f073
--- /dev/null
+++ b/src/chrome/content/rules/ClearChain.com.xml
@@ -0,0 +1,21 @@
+<!--
+	Non-functional hosts
+		SSL peer certificate was not OK:
+			 - cdn.clearchain.com
+			 - leo.clearchain.com
+			 - mail.clearchain.com
+			 - northgate.clearchain.com
+			 - ns.clearchain.com
+
+		Secure connection redirects to plaintext:
+			 - www.clearchain.com
+-->
+<ruleset name="ClearChain.com (partial)" platform="mixedcontent">
+	<target host="clearchain.com" />
+	<target host="www.clearchain.com" />
+		<test url="http://www.clearchain.com/blog/" />
+
+	<securecookie host="^(www\.)?clearchain\.com$" name=".+" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/ClearChain.xml b/src/chrome/content/rules/ClearChain.xml
deleted file mode 100644
index 05b637cee3df..000000000000
--- a/src/chrome/content/rules/ClearChain.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://clearchain.com/ => https://www.clearchain.com/: (60, 'SSL certificate problem: self signed certificate in certificate chain')
-Fetch error: http://www.clearchain.com/ => https://www.clearchain.com/: (60, 'SSL certificate problem: self signed certificate in certificate chain')
--->
-<ruleset name="ClearChain" platform="cacert" default_off='failed ruleset test'>
-
-	<target host="clearchain.com" />
-	<target host="www.clearchain.com" />
-
-
-	<securecookie host="^www\.clearchain\.com$" name=".*" />
-
-
-	<!--	Cert doesn't match !www.	-->
-	<rule from="^http://(?:www\.)?clearchain\.com/"
-		to="https://www.clearchain.com/" />
-
-</ruleset>