diff --git a/src/chrome/content/rules/CNBC-mixed.xml b/src/chrome/content/rules/CNBC-mixed.xml
deleted file mode 100644
index 0abfb7909090..000000000000
--- a/src/chrome/content/rules/CNBC-mixed.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://data.cnbc.com/ => https://data.cnbc.com/: (56, 'Recv failure: Connection reset by peer')
-	For rules that are on by default, see CNBC.xml.
-
-
-	Mixed pages from apps & css from sc
-
--->
-<ruleset name="CNBC (mixed content)" platform="mixedcontent" default_off='failed ruleset test'>
-
-	<target host="data.cnbc.com" />
-
-
-	<rule from="^http://data\.cnbc\.com/"
-		to="https://data.cnbc.com/" />
-
-</ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/CNBC.com-mixed.xml b/src/chrome/content/rules/CNBC.com-mixed.xml
new file mode 100644
index 000000000000..e9dc418abb51
--- /dev/null
+++ b/src/chrome/content/rules/CNBC.com-mixed.xml
@@ -0,0 +1,9 @@
+<!--
+	For more CNBC.com related, see CNBC.com.xml
+-->
+<ruleset name="CNBC.com (mixed)" platform="mixedcontent">
+	<target host="webcast.cnbc.com" />
+		<test url="http://webcast.cnbc.com/show/futuresnow" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/CNBC.com.xml b/src/chrome/content/rules/CNBC.com.xml
new file mode 100644
index 000000000000..6386403d3295
--- /dev/null
+++ b/src/chrome/content/rules/CNBC.com.xml
@@ -0,0 +1,68 @@
+<!--
+	Other CNBC.com related ruleset:
+		- CNBC.com-mixed.xml
+
+	Non-functional hosts
+		Couldn't connect to server:
+			 - apps.cnbc.com
+				- http://apps.cnbc.com/company/quote/newindex.asp?symbol=616660
+
+		SSL peer certificate was not OK:
+			 - data.cnbc.com
+			 - product.cnbc.com
+			 - sc.cnbc.com
+			 - video.cnbc.com
+
+		4xx client error:
+			 - bigdata.cnbc.com
+
+		Secure connection redirects to plaintext:
+			 - www.cnbc.com
+			 - deliveringalpha.cnbc.com
+			 - futuresnow.cnbc.com
+			 - watchlist.cnbc.com
+
+		Mixed Content Blocking (MCB) tiggered:
+			 - webcast.cnbc.com
+				 - https://webcast.cnbc.com/show/futuresnow
+-->
+<ruleset name="CNBC.com (partial)">
+	<target host="cnbc.com" />
+	<target host="www.cnbc.com" />
+	<exclusion pattern="^http://www\.cnbc\.com/$" />
+		<test url="http://www.cnbc.com/fonts/fontawesome-webfont.woff2?v=4.3.0" />
+		<test url="http://www.cnbc.com/fonts/cnbc_font_icons.woff?-k1ej6q" />
+		<test url="http://www.cnbc.com/staticContent/showads.js" />
+		<test url="http://www.cnbc.com/staticcontent/global.2.css?vn=399" />
+		<test url="http://www.cnbc.com/staticcontent/home_page_ng.css?vn=399" />
+	<target host="commentsapi.cnbc.com" />
+	<target host="fm.cnbc.com" />
+		<test url="http://fm.cnbc.com/applications/cnbc.com/resources/img/editorial/2016/09/14/103940717-DSC_3362-2.350x197.jpg" />
+		<test url="http://fm.cnbc.com/applications/cnbc.com/resources/img/editorial/2017/02/21/104294496-Le_Pen_Germany_.240x160.jpg" />
+		<test url="http://fm.cnbc.com/dynamicyield/8765304/api_static.js" />
+	<target host="gdsapi.cnbc.com" />
+	<target host="login.cnbc.com" />
+		<test url="http://login.cnbc.com/authproxy/portfolio/auth.do?Action=portfolio" />
+	<target host="media.cnbc.com" />
+		<test url="http://media.cnbc.com/i/CNBC/Components/Email/NewsBrief/dotComLogo.jpg" />
+		<test url="http://media.cnbc.com/i/CNBC/Sections/CNBC_TV/CNBC_US/Shows/DonnyDeutsch/Slideshows/071121/DD-05.jpg" />
+		<test url="http://media.cnbc.com/i/CNBC/Sections/CNBC_TV/CNBC_Asia/Schedules/Nikkei_April08.pdf" />
+	<target host="mps.cnbc.com" />
+		<test url="http://mps.cnbc.com/fetch/ext/load-cnbc.com-relaunch.js" />
+	<target host="portfolio.cnbc.com" />
+	<target host="pro.cnbc.com" />
+	<target host="quote.cnbc.com" />
+		<test url="http://quote.cnbc.com/quote-html-webservice/quoteform.htm" />
+	<target host="register.cnbc.com" />
+	<target host="pages.response.cnbc.com" />
+
+	<rule from="^http://cnbc\.com/" 
+			to="https://cnbc.com/" />
+	
+	<rule from="^http://(commentsapi|fm|gdsapi|login|media|mps|portfolio|pro|quote|register|pages\.response)\.cnbc\.com/"
+			to="https://$1.cnbc.com/" />
+
+	<rule from="^http://www\.cnbc\.com/(fonts|staticcontent|staticContent)/" 
+			to="https://www.cnbc.com/$1/" />
+
+</ruleset>
diff --git a/src/chrome/content/rules/CNBC.xml b/src/chrome/content/rules/CNBC.xml
deleted file mode 100644
index 3e144c101d1b..000000000000
--- a/src/chrome/content/rules/CNBC.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://cnbc.com/ => https://cnbc.com/: Cycle detected - URL already encountered: https://www.cnbc.com/
-	For rules causing mixed content, see CNBC-mixed.xml.
-
-
-	CDN buckets:
-
-		- sc.cnbc.com.edgesuite.net
-
-
-	Nonfunctional subdomains:
-
-		- apps	(no https)
-
-
-	Problematic subdomains:
-
-		- data	(works, mixed active content from apps & sc)
-		- sc	(works, akamai)
-
-
-	Fully covered subdomains:
-
-		- (www.)
-		- fm
-		- login
-		- pro
-		- register
-
--->
-<ruleset name="CNBC (partial)" default_off='failed ruleset test'>
-
-	<target host="cnbc.com" />
-	<target host="*.cnbc.com" />
-
-
-	<securecookie host="^(?:login|pro|register|www)\.cnbc\.com$" name=".+" />
-
-
-	<rule from="^http://((?:fm|login|pro|register|www)\.)?cnbc\.com/"
-		to="https://$1cnbc.com/" />
-
-</ruleset>
\ No newline at end of file