diff --git a/src/chrome/content/rules/CathayPacific.com.xml b/src/chrome/content/rules/CathayPacific.com.xml
new file mode 100644
index 000000000000..0762ffc1b1a0
--- /dev/null
+++ b/src/chrome/content/rules/CathayPacific.com.xml
@@ -0,0 +1,70 @@
+<!--
+	Non-functional hosts
+		Couldn't connect to server:
+		- cms-author-t2.ncs1.ct1.cathaypacific.com
+
+		Timeout was reached:
+		- cathaypacific.com
+		- lifewelltravelled.cathaypacific.com
+		- meet.cathaypacific.com
+		- spiritofhk.cathaypacific.com
+
+		SSL connect error:
+		- uscots.cathaypacific.com
+
+		SSL peer certificate was not OK:
+		- a35k.cathaypacific.com
+		- discovery.cathaypacific.com
+		- marcopolo.cathaypacific.com
+		- links.services.cathaypacific.com
+
+		Failure when receiving data from the peer:
+		- betaremote.cathaypacific.com
+		- mail.cathaypacific.com
+
+		Incomplete certificate chain error:
+		- workwelldone.cathaypacific.com
+
+		4xx client error:
+		- book.cathaypacific.com
+
+		Mixed content blocking (MCB) triggered:
+		- hongkong.cathaypacific.com
+-->
+<ruleset name="CathayPacific.com">
+	<target host="cathaypacific.com" />
+	<target host="www.cathaypacific.com" />
+	<target host="api.cathaypacific.com" />
+	<target host="assets.cathaypacific.com" />
+		<test url="http://assets.cathaypacific.com/applications/vtsurvey/assets/1443148968956_tc.pdf" />
+	<target host="brushwingers.cathaypacific.com" />
+	<target host="businessplus.cathaypacific.com" />
+	<target host="careers.cathaypacific.com" />
+	<target host="cateringplanner.cathaypacific.com" />
+	<target host="en.cathaylab.cathaypacific.com" />
+	<target host="zh.cathaylab.cathaypacific.com" />
+	<target host="cdn.cathaypacific.com" />
+	<target host="cxwork.cathaypacific.com" />
+	<target host="downloads.cathaypacific.com" />
+		<test url="http://downloads.cathaypacific.com/cx/investor/ir2005.pdf" />
+		<test url="http://downloads.cathaypacific.com/cx/traffic/cxtraffic_zh_052003.pdf" />
+	<target host="hackathon.cathaypacific.com" />
+	<target host="holidays.cathaypacific.com" />
+	<target host="icanfly.cathaypacific.com" />
+	<target host="ilearn.cathaypacific.com" />
+	<target host="infosecurity.cathaypacific.com" />
+	<target host="news.cathaypacific.com" />
+	<target host="payment.cathaypacific.com" />
+	<target host="stafftravel.cathaypacific.com" />
+	<target host="sustainability.cathaypacific.com" />
+	<target host="tpms.cathaypacific.com" />
+	<target host="training.cathaypacific.com" />
+	<target host="us.cathaypacific.com" />
+	<target host="upgrade.cathaypacific.com" />
+		<test url="http://upgrade.cathaypacific.com/offer/CathayPacific?lang=zh_HK" />
+
+	<rule from="^http://cathaypacific\.com/"
+		to="https://www.cathaypacific.com/" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/CathayPacificCargo.com.xml b/src/chrome/content/rules/CathayPacificCargo.com.xml
new file mode 100644
index 000000000000..3e9c08096e34
--- /dev/null
+++ b/src/chrome/content/rules/CathayPacificCargo.com.xml
@@ -0,0 +1,15 @@
+<!--
+	Non-functional hosts
+		Couldn't connect to server:
+		- cathaypacificcargo.com
+-->
+<ruleset name="CathayPacificCargo.com">
+	<target host="cathaypacificcargo.com" />
+	<target host="www.cathaypacificcargo.com" />
+		<test url="http://www.cathaypacificcargo.com/Portals/0/Images/News/seattle.jpg" />
+
+	<rule from="^http://cathaypacificcargo\.com/"
+		to="https://www.cathaypacificcargo.com/" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Cathay_Pacific.xml b/src/chrome/content/rules/Cathay_Pacific.xml
deleted file mode 100644
index ab9baf3d5a3a..000000000000
--- a/src/chrome/content/rules/Cathay_Pacific.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://book.cathaypacfic.com/ => https://book.cathaypacfic.com/: (7, 'Failed to connect to book.cathaypacfic.com port 443: Connection refused')
-Fetch error: http://cathaypacificcargo.com/ => https://www.cathaypacficcargo.com/: (6, 'Could not resolve host: www.cathaypacficcargo.com')
-Fetch error: http://cathaypacifichost.com/ => https://www.cathaypacifichost.com/: (7, 'Failed to connect to cathaypacific.com port 443: No route to host')
-Fetch error: http://www.cathaypacifichost.com/ => https://www.cathaypacifichost.com/: (28, 'Connection timed out after 20001 milliseconds')
- Domains not available:
-
-	downloads.cathaypacific.com		(secured domain unreachable)
-	hksevens.cathaypacific.com		(invalid security cert)
-	icanfly.cathaypacific.com		(error code: ssl_error_rx_record_too_long)
-	ilearn.ete.cathaypacific.com		(self-signed cert)
-	learning.cathaypacific.com		(secured domain unreachable)
-	neweconomyclass.cathaypacific.com	(invalid security cert)
-	products.cathaypacific.com		(invalid security cert)
-	uscots.cathaypacific.com		(secured domain unreachable)
-
--->
-
-<ruleset name="Cathay Pacific" default_off="failed ruleset test">
-
-	<target host="cathaypacific.com" />
-	<target host="www.cathaypacific.com" />
-	<target host="book.cathaypacfic.com" />
-	<target host="cdn.cathaypacific.com" />
-	<target host="holidays.cathaypacific.com" />
-	<target host="iconnect.cathaypacific.com" />
-	<target host="ilearn.cathaypacific.com" />
-	<target host="lifewelltravelled.cathaypacific.com" />
-	<target host="remote.cathaypacific.com" />
-	<target host="taipo-01-hkg-remote.cathaypacific.com" />
-	<target host="cheklapkok-01-hkg-remote.cathaypacific.com" />
-
-	<target host="cathaypacificcargo.com" />
-	<target host="www.cathaypacificcargo.com" />
-
-	<target host="cathaypacific-campaign.com" />
-	<target host="www.cathaypacific-campaign.com" />
-
-	<target host="cathaypacifichost.com" />
-	<target host="www.cathaypacifichost.com" />
-
-	<target host="cxholidays.com" />
-	<target host="www.cxholidays.com" />
-
-	<!-- rules below prevent timeouts for URLs without www. prefix -->
-
-	<rule from="^http://cathaypacific\.com/" to="https://www.cathaypacific.com/" />
-
-	<rule from="^http://cathaypacificcargo\.com/" to="https://www.cathaypacficcargo.com/" />
-
-	<rule from="^http://cathaypacifichost\.com/" to="https://www.cathaypacifichost.com/" />
-
-	<rule from="^http://cxholidays\.com/" to="https://www.cxholidays.com/" />
-
-	<!-- rules above prevent timeouts for URLs without www. prefix -->
-
-	<rule from="^http:" to="https:" />
-
-</ruleset>