diff --git a/src/chrome/content/rules/ThreatMetrix.com-falsemixed.xml b/src/chrome/content/rules/ThreatMetrix.com-falsemixed.xml
deleted file mode 100644
index b61ce40dcc04..000000000000
--- a/src/chrome/content/rules/ThreatMetrix.com-falsemixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://threatmetrix.com/ => https://threatmetrix.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-	For rules not causing false/broken MCB, see Threat_Metrix.com.xml.
-
--->
-<ruleset name="ThreatMetrix.com (false MCB)" platform="mixedcontent" default_off='failed ruleset test'>
-
-	<target host="threatmetrix.com" />
-	<target host="www.threatmetrix.com" />
-
-
-	<securecookie host="^(?:www\.)?threatmetrix\.com$" name=".+" />
-
-
-	<rule from="^http:" to="https:" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/ThreatMetrix.com.xml b/src/chrome/content/rules/ThreatMetrix.com.xml
index 329d94662eb5..340ae1a56061 100644
--- a/src/chrome/content/rules/ThreatMetrix.com.xml
+++ b/src/chrome/content/rules/ThreatMetrix.com.xml
@@ -1,34 +1,50 @@
 <!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://threatmetrix.com/ => http://threatmetrix.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-	For rules causing false/broken MCB, see Threat_Metrix.com-falsemixed.xml.
-
-
-	Mixed content:
-
-		- css from $self *
-
-		- Images from $self *
-
-	* Secured by us
-
+	Non-functional hosts
+		Couldn't connect to server:
+			 - autodiscover.threatmetrix.com
+			 - go.threatmetrix.com
+			 - portal2-qa2.threatmetrix.com
+			 - portal3.threatmetrix.com
+			 - tardis.threatmetrix.com
+
+		Timeout was reached:
+			 - ccc.threatmetrix.com
+			 - us-oem1.delivery.threatmetrix.com
+			 - us-oem2.delivery.threatmetrix.com
+			 - mail.threatmetrix.com
+			 - portal2-am1.threatmetrix.com
+			 - reporting-qa1.threatmetrix.com
+			 - reporting2.threatmetrix.com
+			 - smtp.threatmetrix.com
+
+		SSL peer certificate was not OK:
+			 - dataviz.threatmetrix.com
+			 - explore.threatmetrix.com
+
+		Incomplete certificate chain error:
+			 - portal2-qaperf2.threatmetrix.com
+
+		4xx client error:
+			 - cas.threatmetrix.com
+			 - demonstration.threatmetrix.com
+			 - reporting-qa2.threatmetrix.com
+			 - sso-qa1.threatmetrix.com
+			 - sso-qaperf2.threatmetrix.com
+			 - tdmobile.threatmetrix.com
 -->
-<ruleset name="ThreatMetrix.com (partial)" default_off='failed ruleset test'>
-
+<ruleset name="Threat Metrix.com (partial)">
 	<target host="threatmetrix.com" />
 	<target host="www.threatmetrix.com" />
-		<!--
-			Avoid false/broken MCB:
-						-->
-		<!--exclusion pattern="^http://(www\.)?threatmetrix\.com/+(?!favicon\.ico|wp-content/|wp-includes/)" /-->
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^(www\.)?threatmetrix\.com$" name="^PHPSESSID$" /-->
-
-
-	<rule from="^http://(www\.)?threatmetrix\.com/(?=favicon\.ico|wp-content/|wp-includes/)"
-		to="https://$1threatmetrix.com/" />
-
+	<target host="ask.threatmetrix.com" />
+	<target host="info.threatmetrix.com" />
+	<target host="jasper-qa1.threatmetrix.com" />
+	<target host="kb.threatmetrix.com" />
+	<target host="portal.threatmetrix.com" />
+	<target host="portal-qa1.threatmetrix.com" />
+	<target host="portal2.threatmetrix.com" />
+	<target host="portal2-qa1.threatmetrix.com" />
+	<target host="report.threatmetrix.com" />
+	<target host="reporting.threatmetrix.com" />
+
+	<rule from="^http:" to="https:" />
 </ruleset>