diff --git a/https-everywhere-checker b/https-everywhere-checker
index 2ec94f1ce11a..1b2d8cc64f5e 160000
--- a/https-everywhere-checker
+++ b/https-everywhere-checker
@@ -1 +1 @@
-Subproject commit 2ec94f1ce11a2046408a8df228447e2f0dd85cda
+Subproject commit 1b2d8cc64f5ea267ab6ea60b99d0eb94219ef2be
diff --git a/src/chrome/content/rules/Google-mismatches.xml b/src/chrome/content/rules/Google-mismatches.xml
index fe0087383676..9c90aaa94f2f 100644
--- a/src/chrome/content/rules/Google-mismatches.xml
+++ b/src/chrome/content/rules/Google-mismatches.xml
@@ -1,5 +1,6 @@
 <!--
-
+	For other Google coverage, see GoogleServices.xml.
+	
 	Problematic domains:
 
 		- (www.)apture.com	(works, mismatched, CN: *.google.com)
diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
new file mode 100644
index 000000000000..ecc979e0d802
--- /dev/null
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -0,0 +1,141 @@
+<!--
+	See Google.com_Subdomains_Complex.html for rules that don't match the simple rule here
+	For other Google coverage, see GoogleServices.xml
+
+	Nonfunctional domains:
+
+		- partnerpage.google.com *
+		- picasa.google.com *
+		- www.picasa.google.com ²
+		- safebrowsing.clients.google.com	(404, mismatched)
+		- (www.)googlesyndicatedsearch.com	(404; mismatched, CN: google.com)
+		- buttons.googlesyndication.com *
+
+	* 404, valid cert
+	² 404; mismatched, CN: www.google.com
+
+	Problematic domains:
+
+		- www.goo.gl		(404; mismatched, CN: *.google.com)
+
+		- www.news.google.ca ²
+
+		- google.com subdomains:
+
+			- cbks0 ****
+			- earth *
+			- gg		($ 404s)
+			- knoll *
+			- scholar **
+			- trends *
+
+	Partially covered domains:
+
+		- google.cctld subdomains:
+
+			- scholar	(→ www)
+
+		- google.com subdomains:
+
+			- (www.)
+			- cbks0		($ 404s)
+			- gg		($ 404s)
+			- news		(→ www)
+			- scholar	(→ www)
+-->
+<ruleset name="Google.com Subdomains">
+	<target host="admin.google.com" />
+	<target host="apis.google.com" />
+		<!-- See the complex ruleset for chart.apis -->
+	<target host="appengine.google.com" />
+	<target host="calendar.google.com" />
+	<target host="cast.google.com" />
+	<target host="cbks0.google.com" />
+	<target host="cert-test.sandbox.google.com" />
+	<target host="chat.google.com" />
+	<target host="checkout.google.com" />
+	<target host="chrome.google.com" />
+	<target host="clients.google.com" />
+		<!-- See the complex ruleset for clients\d -->
+		<!-- See the complex ruleset for *.clients\d -->
+	<target host="cloud.google.com" />
+	<target host="code.google.com" />
+		<!-- See the complex ruleset for codesearch -->
+	<target host="corp.google.com" />
+		<target host="*.corp.google.com" />
+		<!-- See the wildcard section -->
+	<target host="developers.google.com" />
+	<target host="dl.google.com" />
+	<target host="docs.google.com" />
+		<!-- See the complex ruleset for docs\d -->
+		<!-- See the complex ruleset for \d\.docs -->
+	<target host="drive.google.com" />
+	<target host="encrypted.google.com" />
+		<!-- See the complex ruleset for encrypted-tbn\d -->
+	<target host="feedburner.google.com" />
+	<target host="feedproxy.google.com" />
+	<target host="fiber.google.com" />
+	<target host="fonts.google.com" />
+	<target host="gg.google.com" />
+	<target host="glass.google.com" />
+	<target host="goto.google.com" />
+	<target host="health.google.com" />
+	<target host="helpouts.google.com" />
+	<target host="history.google.com" />
+	<target host="talkgadget.google.com" />
+	<target host="hostedtalkgadget.google.com" />
+	<target host="investor.google.com" />
+	<target host="ipv4.google.com" />
+	<target host="ipv6.google.com" />
+	<!-- See GoogleMaps.xml for khms\d? -->
+	<target host="knol.google.com" />
+	<target host="knoll.google.com" />
+	<target host="mail.google.com" />
+		<target host="chatenabled.mail.google.com" />
+	<!-- See GoogleMaps.xml for maps -->
+	<!-- See GoogleMaps.xml for maps-api-ssl -->
+	<!-- See GoogleMaps.xml for mw2 -->
+	<target host="pack.google.com" />
+	<target host="pki.google.com" />
+	<target host="play.google.com" />
+	<target host="plus.google.com" />
+		<target host="plus.sandbox.google.com" />
+	<target host="plusone.google.com" />
+	<target host="productforums.google.com" />
+	<target host="profiles.google.com" />
+	<target host="safebrowsing-cache.google.com" />
+	<target host="sb-ssl.google.com" />
+	<!-- see Google.tld_Subdomains.xml for scholar -->
+	<target host="script.google.com" />
+	<target host="security.google.com" />
+	<target host="services.google.com" />
+	<target host="servicessites.google.com" />
+	<target host="sites.google.com" />
+	<target host="slides.google.com" />
+	<!-- see GoogleSorry.xml for sorry -->
+	<target host="spreadsheets.google.com" />
+	<target host="suggestqueries.google.com" />
+	<target host="support.google.com" />
+	<target host="talk.google.com" />
+	<!-- See the complex ruleset for tbn\d -->
+	<target host="tools.google.com" />
+	<target host="wallet.google.com" />
+
+	<securecookie host="^(?:\.code|login\.corp|developers|docs|\d\.docs|fiber|mail|plus|\.?productforums|support)\.google\.[\w.]{2,6}$" name=".+" />
+
+	<!-- *.corp wildcard -->
+	<rule from="^http://([\w-]+)\.corp\.google\.com/"
+			to="https://$1.corp.google.com/" />
+		<test url="http://login.corp.google.com/" />
+		<test url="http://ideas.corp.google.com/" />
+		<test url="http://discovery.corp.google.com/" />
+
+	<!-- subdomain to path redirects -->
+	<rule from="^http://(earth|trends)\.google\.com/"
+		 to="https://www.google.com/$1" />
+		<test url="http://earth.google.com/" />
+		<test url="http://trends.google.com/" />
+
+	<rule from="^http:"
+			to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
new file mode 100644
index 000000000000..3b1805cdf60f
--- /dev/null
+++ b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
@@ -0,0 +1,72 @@
+<!--
+	Other Google rulesets:
+		- See Google.com_Subdomains.html for rules that don't match the complex rule here
+		- See GoogleServices.xml for the list
+-->
+<ruleset name="Google.com Subdomains (Complex)">
+	<target host="*.google.com" />
+
+	<rule from="^http://(clients\d)\.google\.com/"
+		 	to="https://clients1.google.com/" />
+		<test url="http://clients1.google.com/" />
+		<test url="http://clients2.google.com/" />
+		<test url="http://clients3.google.com/" />
+		<!--
+			The need for clients\d -> clients1
+
+			"http://clients2.google.com/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1"
+			HTTP/1.1 200 OK
+			"https://clients2.google.com/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1"
+			HTTP/1.1 404 Not Found
+			"https://clients1.google.com/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1"s
+			HTTP/1.1 200 OK
+		-->
+		<!-- This is needed for OCSP responder to work.
+			If OCSP checking is set to hard-fail the user-agent might have troubles accessing some HTTPS sites
+		-->
+		<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
+			<test url="http://clients1.google.com/ocsp" />
+			<test url="http://clients2.google.com/ocsp" />
+			<test url="http://clients3.google.com/ocsp" />
+
+	<rule from="^http://(docs\d)\.google\.com/"
+		 	to="https://$1.google.com/" />
+			<test url="http://docs1.google.com/" />
+			<test url="http://docs2.google.com/" />
+			<test url="http://docs3.google.com/" />
+
+	<rule from="^http://(\d\.docs)\.google\.com/"
+		 	to="https://$1.google.com/" />
+			<test url="http://1.docs.google.com/" />
+			<test url="http://2.docs.google.com/" />
+			<test url="http://3.docs.google.com/" />
+
+	<rule from="^http://(spreadsheets\d)\.google\.com/"
+		 	to="https://$1.google.com/" />
+		<test url="http://spreadsheets1.google.com/" />
+		<test url="http://spreadsheets2.google.com/" />
+		<test url="http://spreadsheets3.google.com/" />
+
+	<rule from="^http://(?:encrypted-)?tbn(\d)\.google\.com/"
+		to="https://encrypted-tbn$1.google.com/" />
+		<test url="http://encrypted-tbn1.google.com/" />
+		<test url="http://encrypted-tbn2.google.com/" />
+		<test url="http://encrypted-tbn3.google.com/" />
+		<test url="http://tbn1.google.com/" />
+		<test url="http://tbn2.google.com/" />
+		<test url="http://tbn3.google.com/" />
+
+	<rule from="^http://chart\.apis\.google\.com/chart"
+	to="https://chart.googleapis.com/chart" />
+		<test url="http://chart.apis.google.com/chart" />
+
+	<rule from="^http://([\w-]+)\.clients\.google\.com/"
+		to="https://$1.clients.google.com/" />
+		<test url="http://foo.clients.google.com/bar" />
+		<test url="http://bar.clients.google.com/" />
+		<test url="http://foobar.clients.google.com/foobar" />
+
+	<rule from="^http://codesearch\.google\.com/"
+		to="https://www.google.com/codesearch/" />
+		<test url="http://codesearch.google.com/" />
+</ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/Google.org.xml b/src/chrome/content/rules/Google.org.xml
index d6cc47881ba2..43f3916f70b0 100644
--- a/src/chrome/content/rules/Google.org.xml
+++ b/src/chrome/content/rules/Google.org.xml
@@ -1,14 +1,10 @@
 <!--
-	For other Google coverage, see GoogleServices.xml.
-
+	For other Google coverage, see GoogleServices.xml
 -->
 <ruleset name="Google.org">
-
 	<target host="google.org" />
 	<target host="www.google.org" />
 
-
-	<rule from="^http://(www\.)?google\.org/"
-		to="https://$1google.org/" />
-
+	<rule from="^http:"
+			to="https:" />
 </ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/Google.tld_Subdomains.xml b/src/chrome/content/rules/Google.tld_Subdomains.xml
new file mode 100644
index 000000000000..8f4e4b8d8e3a
--- /dev/null
+++ b/src/chrome/content/rules/Google.tld_Subdomains.xml
@@ -0,0 +1,68 @@
+<!--
+	For other Google coverage, see GoogleServices.xml
+
+	This ruleset is subdomains that exist on google.tld (not just google.com)
+
+	*** images.google.tld is covered in GoogleImages.xml ***
+-->
+<ruleset name="Google.tld Subdomains">
+	<!--
+		failure: *.google.* failed: The target host must be a hostname, not URL, and must use at most one wildcard.
+	-->
+	<target host="accounts.google.*" />
+	<target host="adwords.google.*" />
+	<target host="finance.google.*" />
+	<target host="groups.google.*" />
+	<target host="id.google.*" />
+	<target host="lh2.google.*" />
+	<target host="lh3.google.*" />
+	<target host="lh4.google.*" />
+	<target host="lh5.google.*" />
+	<target host="lh6.google.*" />
+	<target host="m.google.*" />
+	<target host="news.google.*" />
+	<target host="picasaweb.google.*" />
+	<target host="scholar.google.*" />
+
+	<securecookie host="^(?:accounts|adwords|m|picasaweb)\.google\.[\w.]{2,6}$" name=".+" />
+
+	<!-- path that 404 on https but 301 on http -->
+	<rule from="^http://news\.google\.((?:com?\.)?\w{2,3})/archivesearch"
+			to="https://news.google.$1/news/advanced_news_search" />
+		<test url="http://news.google.ca/archivesearch" />
+		<test url="http://news.google.com/archivesearch" />
+		<test url="http://news.google.com.au/archivesearch" />
+
+	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|news|picasaweb|scholar)\.google\.((?:com?\.)?\w{2,3})/"
+			to="https://$1.google.$2/" />
+		<test url="http://accounts.google.ca/" />
+		<test url="http://accounts.google.com/" />
+		<test url="http://accounts.google.com.au/" />
+		<test url="http://adwords.google.ca/" />
+		<test url="http://adwords.google.com/" />
+		<test url="http://adwords.google.com.au/" />
+		<test url="http://finance.google.ca/" />
+		<test url="http://finance.google.com/" />
+		<test url="http://finance.google.com.au/" />
+		<test url="http://groups.google.ca/" />
+		<test url="http://groups.google.com/" />
+		<test url="http://groups.google.com.au/" />
+		<test url="http://id.google.ca/" />
+		<test url="http://id.google.com/" />
+		<test url="http://id.google.com.au/" />
+		<test url="http://lh3.google.ca/" />
+		<test url="http://lh4.google.com/" />
+		<test url="http://lh5.google.com.au/" />
+		<test url="http://m.google.ca/" />
+		<test url="http://m.google.com/" />
+		<test url="http://m.google.com.au/" />
+		<test url="http://news.google.ca/" />
+		<test url="http://news.google.com/" />
+		<test url="http://news.google.com.au/" />
+		<test url="http://picasaweb.google.ca/" />
+		<test url="http://picasaweb.google.com/" />
+		<test url="http://picasaweb.google.com.au/" />
+		<test url="http://scholar.google.ca/" />
+		<test url="http://scholar.google.com/" />
+		<test url="http://scholar.google.com.au/" />
+</ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
new file mode 100644
index 000000000000..4919b50cfbda
--- /dev/null
+++ b/src/chrome/content/rules/Google.xml
@@ -0,0 +1,428 @@
+<!--
+	This ruleset only covers (www.)?google.tld
+	For other Google coverage, see GoogleServices.xml
+
+	*** Google Images related paths are covered in GoogleImages.xml ***
+
+	Nonfunctional google.com paths:
+
+		- analytics	*
+		- imgres *
+		- u/		(404)
+
+	* Redirects to http
+-->
+<ruleset name="Google">
+	<target host="google.*" />
+	<target host="www.google.*" />
+	<exclusion pattern="^http://(www\.)?google\.com/analytics/" />
+		<test url="http://www.google.com/analytics/" />
+		<test url="http://google.com/analytics/" />
+	<exclusion pattern="^http://(www\.)?google\.com/imgres/" />
+		<test url="http://www.google.com/imgres/" />
+		<test url="http://google.com/imgres/" />
+
+	<securecookie host="^www\.google\.com$" name="^GoogleAccountsLocale_session$" />
+	<!--	Not secured by server:
+					-->
+	<!--securecookie host="^\.google\.com$" name="^(APISID|HSID|NID|PREF|SID)$" /-->
+	<!--
+		Can we secure any of these wildcard cookies safely?
+									-->
+	<!--securecookie host="^\.google\.com$" name="^(hl|I4SUserLocale|NID|PREF|S)$" /-->
+	<!--securecookie host="^\.google\.[\w.]{2,6}$" name="^(hl|I4SUserLocale|NID|PREF|S|S_awfe)$" /-->
+
+	<!-- Problems -->
+	<!--	First handle problematic tlds:
+				- www.google.bo *
+				- www.google.co *
+				- www.google.ec *
+				- www.google.in **
+				- www.google.kr *
+				- www.google.com.kz *
+				- www.google.com.lk *
+				- www.google.mx *
+				- www.google.sg *
+				- www.google.sl *
+				- www.google.ug *
+				- www.google.vn *
+
+			* mismatched, CN: google.com
+			** 404
+	-->
+	<rule from="^http://(?:www\.)?google\.co/"
+		to="https://www.google.com/" />
+		<test url="http://google.co/" />
+		<test url="http://www.google.co/" />
+
+	<rule from="^http://(?:www\.)?google\.(?:co\.)?(in|kr|ug)/"
+		to="https://www.google.co.$1/" />
+		<test url="http://google.co.in/" />
+		<test url="http://www.google.co.in/" />
+		<test url="http://google.co.kr/" />
+		<test url="http://www.google.co.kr/" />
+		<test url="http://google.co.ug/" />
+		<test url="http://www.google.co.ug/" />
+
+	<rule from="^http://(?:www\.)?google\.(?:com\.)?(kz|lk)/"
+		to="https://www.google.$1/" />
+		<test url="http://google.com.kz/" />
+		<test url="http://www.google.com.kz/" />
+		<test url="http://google.com.lk/" />
+		<test url="http://www.google.com.lk/" />
+
+	<rule from="^http://(?:www\.)?google\.(?:com\.)?(bo|ec|mx|sg|sl|vn)/"
+		to="https://www.google.com.$1/" />
+		<test url="http://google.com.bo/" />
+		<test url="http://www.google.com.bo/" />
+		<test url="http://google.com.ec/" />
+		<test url="http://www.google.com.ec/" />
+		<test url="http://google.com.mx/" />
+		<test url="http://www.google.com.mx/" />
+		<test url="http://google.com.sg/" />
+		<test url="http://www.google.com.sg/" />
+		<test url="http://google.com.sl/" />
+		<test url="http://www.google.com.sl/" />
+		<test url="http://google.com.vn/" />
+		<test url="http://www.google.com.vn/" />
+
+		<!--
+			https://www.google.com.au/tisp/	200 (OK)
+			https://www.google.com.au/tisp	404
+			https://www.google.com/tisp		404
+			http://www.google.com/tisp		301 (redirect)
+					-->
+		<rule from="^https?://(?:www\.)?google\.((?:com?\.)?\w{2,3})/tisp(?=$|\?)"
+			to="https://www.google.$1/tisp/" />
+			<test url="http://www.google.ca/tisp" />
+			<test url="http://www.google.com/tisp" />
+			<test url="http://www.google.com.au/tisp" />
+			<test url="https://www.google.ca/tisp" />
+			<test url="https://www.google.com/tisp" />
+			<test url="https://www.google.com.au/tisp" />
+			<test url="http://google.ca/tisp?" />
+			<test url="http://google.com/tisp?" />
+			<test url="http://google.com.au/tisp?" />
+	<!-- /problems -->
+
+	<!-- Google CSE -->
+	<rule from="^http://(?:www\.)?google\.(?:com?\.)?\w{2,3}/custom"
+		 to="https://www.google.com/cse" />
+		<test url="http://google.ca/custom" />
+		<test url="http://google.com/custom" />
+		<test url="http://google.com.au/custom" />
+		<test url="http://www.google.ca/custom" />
+		<test url="http://www.google.com/custom" />
+		<test url="http://www.google.com.au/custom" />
+		
+	<!--   Paths that 404 on .ccltd, but work on .com:   -->
+	<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
+		 	to="https://www.google.com/" />
+		<test url="http://www.google.ca/calendar" />
+		<test url="http://www.google.com/calendar" />
+		<test url="http://www.google.com.au/calendar" />
+		<test url="http://www.google.ca/dictionary" />
+		<test url="http://www.google.com/dictionary" />
+		<test url="http://www.google.com.au/dictionary" />
+		<test url="http://www.google.ca/doubleclick" />
+		<test url="http://www.google.com/doubleclick" />
+		<test url="http://www.google.com.au/doubleclick" />
+		<test url="http://www.google.ca/foobar" />
+		<test url="http://www.google.com/foobar" />
+		<test url="http://www.google.com.au/foobar" />
+		<test url="http://www.google.ca/help" />
+		<test url="http://www.google.com/help" />
+		<test url="http://www.google.com.au/help" />
+		<test url="http://www.google.ca/ideas" />
+		<test url="http://www.google.com/ideas" />
+		<test url="http://www.google.com.au/ideas" />
+		<test url="http://www.google.ca/pacman" />
+		<test url="http://www.google.com/pacman" />
+		<test url="http://www.google.com.au/pacman" />
+		<test url="http://www.google.ca/partners" />
+		<test url="http://www.google.com/partners" />
+		<test url="http://www.google.com.au/partners" />
+		<test url="http://www.google.ca/postini" />
+		<test url="http://www.google.com/postini" />
+		<test url="http://www.google.com.au/postini" />
+		<test url="http://www.google.ca/powermeter" />
+		<test url="http://www.google.com/powermeter" />
+		<test url="http://www.google.com.au/powermeter" />
+		<test url="http://www.google.ca/url" />
+		<test url="http://www.google.com/url" />
+		<test url="http://www.google.com.au/url" />
+		<test url="http://www.google.ca/webdesigner" />
+		<test url="http://www.google.com/webdesigner" />
+		<test url="http://www.google.com.au/webdesigner" />
+
+	<!-- The site's main page -->
+	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(?=#|\?|$)"
+		to="https://www.google.$2/" />
+		<test url="http://google.ca/" />
+		<test url="http://google.com/" />
+		<test url="http://google.com.au/" />
+		<test url="http://www.google.ca/#" />
+		<test url="http://www.google.com/#" />
+		<test url="http://www.google.com.au/#" />
+		<test url="http://www.google.ca/?" />
+		<test url="http://www.google.com/?" />
+		<test url="http://www.google.com.au/?" />
+
+	<!--   Paths that work on all in google.*   -->
+	<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/(?=about|accounts|adplanner|ads|adsense|adwords|analytics|bookmarks|books|chrome|chromecast|contacts|coop|cse|css|culturalinstitute|doodles|earth|favicon.ico|finance|get|goodtoknow|googleblogs|grants|green|hangouts|hostednews|images|intl|js|landing|logos|mapmaker|mobile|newproducts|news|nexus|patents|policies|prdhp|profiles|products|reader|s2|script|search|setprefs|settings|shopping|support|teapot|tools|transparencyreport|trends|urchin|webhp|webmasters)"
+		 to="https://www.google.$1/" />
+		<test url="http://www.google.ca/about" />
+		<test url="http://www.google.com/about" />
+		<test url="http://www.google.com.au/about" />
+		<test url="http://www.google.ca/accounts" />
+		<test url="http://www.google.com/accounts" />
+		<test url="http://www.google.com.au/accounts" />
+		<test url="http://www.google.ca/adplanner" />
+		<test url="http://www.google.com/adplanner" />
+		<test url="http://www.google.com.au/adplanner" />
+		<test url="http://www.google.ca/ads" />
+		<test url="http://www.google.com/ads" />
+		<test url="http://www.google.com.au/ads" />
+		<test url="http://www.google.ca/adsense" />
+		<test url="http://www.google.com/adsense" />
+		<test url="http://www.google.com.au/adsense" />
+		<test url="http://www.google.ca/adwords" />
+		<test url="http://www.google.com/adwords" />
+		<test url="http://www.google.com.au/adwords" />
+		<test url="http://www.google.ca/analytics" />
+		<test url="http://www.google.com/analytics" />
+		<test url="http://www.google.com.au/analytics" />
+		<test url="http://www.google.ca/bookmarks" />
+		<test url="http://www.google.com/bookmarks" />
+		<test url="http://www.google.com.au/bookmarks" />
+		<test url="http://www.google.ca/books" />
+		<test url="http://www.google.com/books" />
+		<test url="http://www.google.com.au/books" />
+		<test url="http://www.google.ca/chrome" />
+		<test url="http://www.google.com/chrome" />
+		<test url="http://www.google.com.au/chrome" />
+		<test url="http://www.google.ca/chromecast" />
+		<test url="http://www.google.com/chromecast" />
+		<test url="http://www.google.com.au/chromecast" />
+		<test url="http://www.google.ca/contacts" />
+		<test url="http://www.google.com/contacts" />
+		<test url="http://www.google.com.au/contacts" />
+		<test url="http://www.google.ca/coop" />
+		<test url="http://www.google.com/coop" />
+		<test url="http://www.google.com.au/coop" />
+		<test url="http://www.google.ca/cse" />
+		<test url="http://www.google.com/cse" />
+		<test url="http://www.google.com.au/cse" />
+		<test url="http://www.google.ca/css" />
+		<test url="http://www.google.com/css" />
+		<test url="http://www.google.com.au/css" />
+		<test url="http://www.google.ca/culturalinstitute" />
+		<test url="http://www.google.com/culturalinstitute" />
+		<test url="http://www.google.com.au/culturalinstitute" />
+		<test url="http://www.google.ca/doodles" />
+		<test url="http://www.google.com/doodles" />
+		<test url="http://www.google.com.au/doodles" />
+		<test url="http://www.google.ca/earth" />
+		<test url="http://www.google.com/earth" />
+		<test url="http://www.google.com.au/earth" />
+		<test url="http://www.google.ca/favicon.ico" />
+		<test url="http://www.google.com/favicon.ico" />
+		<test url="http://www.google.com.au/favicon.ico" />
+		<test url="http://www.google.ca/finance" />
+		<test url="http://www.google.com/finance" />
+		<test url="http://www.google.com.au/finance" />
+		<test url="http://www.google.ca/get" />
+		<test url="http://www.google.com/get" />
+		<test url="http://www.google.com.au/get" />
+		<test url="http://www.google.ca/goodtoknow" />
+		<test url="http://www.google.com/goodtoknow" />
+		<test url="http://www.google.com.au/goodtoknow" />
+		<test url="http://www.google.ca/googleblogs" />
+		<test url="http://www.google.com/googleblogs" />
+		<test url="http://www.google.com.au/googleblogs" />
+		<test url="http://www.google.ca/grants" />
+		<test url="http://www.google.com/grants" />
+		<test url="http://www.google.com.au/grants" />
+		<test url="http://www.google.ca/green" />
+		<test url="http://www.google.com/green" />
+		<test url="http://www.google.com.au/green" />
+		<test url="http://www.google.ca/hangouts" />
+		<test url="http://www.google.com/hangouts" />
+		<test url="http://www.google.com.au/hangouts" />
+		<test url="http://www.google.ca/hostednews" />
+		<test url="http://www.google.com/hostednews" />
+		<test url="http://www.google.com.au/hostednews" />
+		<test url="http://www.google.ca/images" />
+		<test url="http://www.google.com/images" />
+		<test url="http://www.google.com.au/images" />
+		<test url="http://www.google.ca/intl" />
+		<test url="http://www.google.com/intl" />
+		<test url="http://www.google.com.au/intl" />
+		<test url="http://www.google.ca/js" />
+		<test url="http://www.google.com/js" />
+		<test url="http://www.google.com.au/js" />
+		<test url="http://www.google.ca/landing" />
+		<test url="http://www.google.com/landing" />
+		<test url="http://www.google.com.au/landing" />
+		<test url="http://www.google.ca/logos" />
+		<test url="http://www.google.com/logos" />
+		<test url="http://www.google.com.au/logos" />
+		<test url="http://www.google.ca/mapmaker" />
+		<test url="http://www.google.com/mapmaker" />
+		<test url="http://www.google.com.au/mapmaker" />
+		<test url="http://www.google.ca/mobile" />
+		<test url="http://www.google.com/mobile" />
+		<test url="http://www.google.com.au/mobile" />
+		<test url="http://www.google.ca/newproducts" />
+		<test url="http://www.google.com/newproducts" />
+		<test url="http://www.google.com.au/newproducts" />
+		<test url="http://www.google.ca/news" />
+		<test url="http://www.google.com/news" />
+		<test url="http://www.google.com.au/news" />
+		<test url="http://www.google.ca/nexus" />
+		<test url="http://www.google.com/nexus" />
+		<test url="http://www.google.com.au/nexus" />
+		<test url="http://www.google.ca/patents" />
+		<test url="http://www.google.com/patents" />
+		<test url="http://www.google.com.au/patents" />
+		<test url="http://www.google.ca/policies" />
+		<test url="http://www.google.com/policies" />
+		<test url="http://www.google.com.au/policies" />
+		<test url="http://www.google.ca/prdhp" />
+		<test url="http://www.google.com/prdhp" />
+		<test url="http://www.google.com.au/prdhp" />
+		<test url="http://www.google.ca/profiles" />
+		<test url="http://www.google.com/profiles" />
+		<test url="http://www.google.com.au/profiles" />
+		<test url="http://www.google.ca/products" />
+		<test url="http://www.google.com/products" />
+		<test url="http://www.google.com.au/products" />
+		<test url="http://www.google.ca/reader" />
+		<test url="http://www.google.com/reader" />
+		<test url="http://www.google.com.au/reader" />
+		<test url="http://www.google.ca/s2" />
+		<test url="http://www.google.com/s2" />
+		<test url="http://www.google.com.au/s2" />
+		<test url="http://www.google.ca/script" />
+		<test url="http://www.google.com/script" />
+		<test url="http://www.google.com.au/script" />
+		<test url="http://www.google.ca/search" />
+		<test url="http://www.google.com/search" />
+		<test url="http://www.google.com.au/search" />
+		<test url="http://www.google.ca/setprefs" />
+		<test url="http://www.google.com/setprefs" />
+		<test url="http://www.google.com.au/setprefs" />
+		<test url="http://www.google.ca/settings" />
+		<test url="http://www.google.com/settings" />
+		<test url="http://www.google.com.au/settings" />
+		<test url="http://www.google.ca/shopping" />
+		<test url="http://www.google.com/shopping" />
+		<test url="http://www.google.com.au/shopping" />
+		<test url="http://www.google.ca/support" />
+		<test url="http://www.google.com/support" />
+		<test url="http://www.google.com.au/support" />
+		<test url="http://www.google.ca/teapot" />
+		<test url="http://www.google.com/teapot" />
+		<test url="http://www.google.com.au/teapot" />
+		<test url="http://www.google.ca/tools" />
+		<test url="http://www.google.com/tools" />
+		<test url="http://www.google.com.au/tools" />
+		<test url="http://www.google.ca/transparencyreport" />
+		<test url="http://www.google.com/transparencyreport" />
+		<test url="http://www.google.com.au/transparencyreport" />
+		<test url="http://www.google.ca/trends" />
+		<test url="http://www.google.com/trends" />
+		<test url="http://www.google.com.au/trends" />
+		<test url="http://www.google.ca/urchin" />
+		<test url="http://www.google.com/urchin" />
+		<test url="http://www.google.com.au/urchin" />
+		<test url="http://www.google.ca/webhp" />
+		<test url="http://www.google.com/webhp" />
+		<test url="http://www.google.com.au/webhp" />
+		<test url="http://www.google.ca/webmasters" />
+		<test url="http://www.google.com/webmasters" />
+		<test url="http://www.google.com.au/webmasters" />
+
+	<!--   Paths that only exist/work on .com   -->
+	<rule from="^http://(www\.)?google\.com/(\+|afsonline|appsstatus|buzz|chat|chart|chromeos|codesearch|extern_js|glass|googlebooks|ig|insights|jsapi|moderator|phone|recaptcha|safebrowsing|uds|videotargetting|webfonts)"
+		to="https://www.google.com/$2" />
+
+		<!--
+			/sorry/ is covered under GoogleSorry.xml
+			-->
+		<test url="http://google.com/+" />
+		<test url="http://google.com/afsonline" />
+		<test url="http://google.com/appsstatus" />
+		<test url="http://google.com/buzz" />
+		<test url="http://google.com/chat" />
+		<test url="http://google.com/chart" />
+		<test url="http://google.com/chromeos" />
+		<test url="http://google.com/codesearch" />
+		<test url="http://google.com/extern_js" />
+		<test url="http://google.com/glass" />
+		<test url="http://google.com/googlebooks" />
+		<test url="http://google.com/ig" />
+		<test url="http://google.com/insights" />
+		<test url="http://google.com/jsapi" />
+		<test url="http://google.com/moderator" />
+		<test url="http://google.com/phone" />
+		<test url="http://google.com/recaptcha" />
+		<test url="http://google.com/safebrowsing" />
+		<test url="http://google.com/uds" />
+		<test url="http://google.com/videotargetting" />
+		<test url="http://google.com/webfonts" />
+		<test url="http://www.google.com/+" />
+		<test url="http://www.google.com/afsonline" />
+		<test url="http://www.google.com/appsstatus" />
+		<test url="http://www.google.com/buzz" />
+		<test url="http://www.google.com/chat" />
+		<test url="http://www.google.com/chart" />
+		<test url="http://www.google.com/chromeos" />
+		<test url="http://www.google.com/codesearch" />
+		<test url="http://www.google.com/extern_js" />
+		<test url="http://www.google.com/glass" />
+		<test url="http://www.google.com/googlebooks" />
+		<test url="http://www.google.com/ig" />
+		<test url="http://www.google.com/insights" />
+		<test url="http://www.google.com/jsapi" />
+		<test url="http://www.google.com/moderator" />
+		<test url="http://www.google.com/phone" />
+		<test url="http://www.google.com/recaptcha" />
+		<test url="http://www.google.com/safebrowsing" />
+		<test url="http://www.google.com/uds" />
+		<test url="http://www.google.com/videotargetting" />
+		<test url="http://www.google.com/webfonts" />
+
+	<!--	A very annoying exception that we
+		seem to need for the basic case
+						-->
+	<exclusion pattern="^http://(www\.)?google\.com/search.*tbs=shop" />
+		<test url="http://google.com/search?q=test&amp;tbs=shop" />
+		<test url="http://www.google.com/search?q=test&amp;tbs=shop" />
+		<test url="http://www.google.com/search?q=foobar&amp;tbs=shop" />
+
+	<!--	This is necessary for image results
+		links from web search results
+						-->
+	<exclusion pattern="^http://(www\.)?google\.com/search.*tbm=isch.*" />
+		<test url="http://google.com/search?q=test&amp;tbm=isch" />
+		<test url="http://www.google.com/search?q=test&amp;tbm=isch" />
+		<test url="http://www.google.com/search?q=foobar&amp;tbm=isch" />
+		<test url="http://www.google.com/search?q=foobar&amp;tbm=isch&amp;something=baz" />
+
+	<!-- 404s when using HTTPS -->
+	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/firefox/?"
+		to="https://www.google.$2/" />
+		<test url="http://google.ca/firefox" />
+		<test url="http://google.com/firefox" />
+		<test url="http://google.com.au/firefox" />
+		<test url="http://www.google.ca/firefox" />
+		<test url="http://www.google.com/firefox" />
+		<test url="http://www.google.com.au/firefox" />
+		<test url="http://google.ca/firefox/" />
+		<test url="http://google.com/firefox/" />
+		<test url="http://google.com.au/firefox/" />
+		<test url="http://www.google.ca/firefox/" />
+		<test url="http://www.google.com/firefox/" />
+		<test url="http://www.google.com.au/firefox/" />
+</ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/GoogleAPIs.xml b/src/chrome/content/rules/GoogleAPIs.xml
index 85a5a8081553..a4fa4ac7eaee 100644
--- a/src/chrome/content/rules/GoogleAPIs.xml
+++ b/src/chrome/content/rules/GoogleAPIs.xml
@@ -1,5 +1,5 @@
 <!--
-	For other Google coverage, see GoogleServices.xml.
+	For other Google coverage, see GoogleServices.xml
 
 
 	Nonfunctional domains:
@@ -66,46 +66,43 @@
 
 -->
 <ruleset name="Google APIs">
-
 	<target host="gmodules.com" />
 	<target host="www.gmodules.com" />
-	<target host="google.com" />
-	<target host="apis.google.com" />
-	<target host="*.apis.google.com" />
-	<target host="*.clients.google.com" />
-	<target host="www.google.com" />
-	<target host="*.google-analytics.com" />
-	<target host="*.googleapis.com" />
+		<!-- need this exclusion otherwise the test checker will use the hosts as test urls -->
+		<exclusion pattern="^http://(www\.)?gmodules\.com/$" />
+
+	<target host="www.google-analytics.com" />
+	<target host="ssl.google-analytics.com" />
+
+	<target host="ajax.googleapis.com" />
+	<target host="chart.googleapis.com" />
+	<target host="fonts.googleapis.com" />
+	<target host="www.googleapis.com" />
+	<target host="*.commondatastorage.googleapis.com" />
+	<target host="*.storage.googleapis.com" />
+
 	<target host="gstatic.com" />
 	<target host="*.gstatic.com" />
+	<target host="api.recaptcha.net" />
+	<target host="api-secure.recaptcha.net" />
+	<target host="gdata.youtube.com" />
+
 	<!--	Captive portal detection redirects to this URL, and many captive
 		portals break TLS, so exempt this redirect URL.
 		See GitHub bug #368
-							-->
-		<exclusion pattern="^http://www\.gstatic\.com/generate_204" />
-	<target host="*.recaptcha.net" />
-	<target host="gdata.youtube.com" />
-		<exclusion pattern="^http://gdata\.youtube\.com/crossdomain\.xml" />
+			-->
+	<exclusion pattern="^http://www\.gstatic\.com/generate_204" />
+		<test url="http://www.gstatic.com/generate_204" />
 
+	<exclusion pattern="^http://gdata\.youtube\.com/crossdomain\.xml" />
+		<test url="http://gdata.youtube.com/crossdomain.xml" />
 
 	<securecookie host="^ssl\.google-analytics\.com$" name=".+" />
 
-
 	<rule from="^http://(?:www\.)?gmodules\.com/ig/images/"
 		to="https://www.google.com/ig/images/" />
-
-	<!--	jsapi was causing problems on some sites that embed google maps:
-		https://trac.torproject.org/projects/tor/ticket/2335
-		Apparently now fixed; thanks, Google!
-							-->
-	<rule from="^http://(?:www\.)?google\.com/(afsonline/|chart|jsapi|recaptcha/|uds)"
-		to="https://www.google.com/$1" />
-
-	<rule from="^http://(api|[\w-]+\.client)s\.google\.com/"
-		to="https://$1s.google.com/" />
-
-	<rule from="^http://chart\.apis\.google\.com/chart"
-		to="https://chart.googleapis.com/chart" />
+		<test url="http://gmodules.com/ig/images/" />
+		<test url="http://www.gmodules.com/ig/images/" />
 
 	<rule from="^http://(ssl|www)\.google-analytics\.com/"
 		to="https://$1.google-analytics.com/" />
@@ -115,6 +112,10 @@
 
 	<rule from="^http://([^@:\./]+\.)?(commondata)?storage\.googleapis\.com/"
 		to="https://$1$2storage.googleapis.com/" />
+		<test url="http://storage.googleapis.com/" />
+		<test url="http://commondatastorage.googleapis.com/" />
+		<test url="http://chromedriver.storage.googleapis.com/" />
+		<test url="http://patentimages.storage.googleapis.com/" />
 
 	<!--	There is an interesting question about whether we should
 		append &strip=1 to all cache URLs.  This causes them to load
@@ -125,11 +126,24 @@
 			With &strip=1, the cached page will be text-only and
 		will come exclusively from Google's HTTPS server.
 									-->
-	<rule from="^http://(?:www\.)?gstatic\.com/"
+	<rule from="^http://(www\.)?gstatic\.com/"
 		to="https://www.gstatic.com/" />
+		<test url="http://www.gstatic.com/" />
 
 	<rule from="^http://(csi|encrypted-tbn\d|g0|[\w-]+\.metric|ssl|t\d)\.gstatic\.com/"
 		to="https://$1.gstatic.com/" />
+		<test url="http://csi.gstatic.com/" />
+		<test url="http://encrypted-tbn1.gstatic.com/" />
+		<test url="http://encrypted-tbn2.gstatic.com/" />
+		<test url="http://encrypted-tbn3.gstatic.com/" />
+		<test url="http://g0.gstatic.com/" />
+		<test url="http://test1-ds.metric.gstatic.com/" />
+		<test url="http://test2-ds.metric.gstatic.com/" />
+		<test url="http://test3-ds.metric.gstatic.com/" />
+		<test url="http://ssl.gstatic.com/" />
+		<test url="http://t1.gstatic.com/" />
+		<test url="http://t2.gstatic.com/" />
+		<test url="http://t3.gstatic.com/" />
 
 	<rule from="^http://api\.recaptcha\.net/"
 		to="https://www.google.com/recaptcha/api/" />
@@ -139,5 +153,4 @@
 
 	<rule from="^http://gdata\.youtube\.com/"
 		to="https://gdata.youtube.com/" />
-
 </ruleset>
diff --git a/src/chrome/content/rules/GoogleCanada.xml b/src/chrome/content/rules/GoogleCanada.xml
deleted file mode 100644
index d5eefe816210..000000000000
--- a/src/chrome/content/rules/GoogleCanada.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ruleset name="GoogleCanada">
-	<target host="google.ca" />
-	<target host="*.google.ca" />
-	<rule from="^http://([^/:@\.]+)\.google\.ca/finance" to="https://$1.google.ca/finance"/>
-</ruleset>
-
diff --git a/src/chrome/content/rules/GoogleImages.xml b/src/chrome/content/rules/GoogleImages.xml
index 0112001e0440..d0945997e541 100644
--- a/src/chrome/content/rules/GoogleImages.xml
+++ b/src/chrome/content/rules/GoogleImages.xml
@@ -1,65 +1,33 @@
 <!--
 	For other Google coverage, see GoogleServices.xml.
-
-
-	Problematic domains:
-
-		- www.google.bo *
-		- www.google.co *
-		- www.google.ec *
-		- www.google.in *
-		- www.google.kr *
-		- www.google.com.kz **
-		- www.google.com.lk *
-		- www.google.mx **
-		- www.google.sg *
-		- www.google.sl *
-		- www.google.ug *
-		- www.google.vn *
-
-	* 404; mismatched, CN: google.com
-	** Works; mismatched, CN: google.com
-
 -->
 <ruleset name="Google Images">
-
 	<target host="google.*" />
 	<target host="www.google.*" />
-	<target host="google.co.*" />
-	<target host="www.google.co.*" />
-	<target host="google.com" />
-	<target host="images.google.com" />
-	<target host="google.com.*" />
-	<target host="www.google.com.*" />
-		<!--
-			Only handle image-related paths in this ruleset:
-										-->
-		<exclusion pattern="^http://(?:www\.)?google(?:\.com?)?\.\w{2,3}/(?!(?:advanced_image_search|imghp|.*tb(?:m=isch|s=sbi)))" />
-
-
-	<rule from="^http://(?:www\.)?google\.com/"
-		to="https://www.google.com/" />
-
-	<rule from="^http://images\.google\.com/"
-		to="https://images.google.com/" />
-
-	<!--	First handle problematic domains:
-							-->
-	<rule from="^http://(?:www\.)?google\.co/"
-		to="https://www.google.com/" />
-
-	<rule from="^http://(?:www\.)?google\.(?:co\.)?(in|kr|ug)/"
-		to="https://www.google.co.$1/" />
-
-	<rule from="^http://(?:www\.)?google\.(?:com\.)?(kz|lk)/"
-		to="https://www.google.$1/" />
-
-	<rule from="^http://(?:www\.)?google\.(?:com\.)?(bo|ec|mx|sg|sl|vn)/"
-		to="https://www.google.com.$1/" />
-
-	<!--	And then the rest:
-					-->
-	<rule from="^http://(?:www\.)?google\.(com?\.)?(ae|ar|at|au|bg|bh|br|ca|ch|cl|co|cr|cu|de|eg|es|fi|fr|gh|gt|hr|id|ie|il|it|jo|jp|jm|ke|kw|lb|ly|my|na|ng|nl|no|nz|om|pa|pe|pk|pl|pt|py|qa|ro|ru|rw|sa|se|sv|th|tr|uk|uy|ve|za|zw)/"
-		to="https://www.google.$1$2/" />
-
+	<target host="images.google.*" />
+
+	<rule from="^http://images\.google\.((?:com?\.)?\w{2,3})/"
+			to="https://images.google.$1/" />
+		<test url="http://images.google.ca/" />
+		<test url="http://images.google.com/" />
+		<test url="http://images.google.com.au/" />
+
+	<!--
+		Only handle image-related paths in this ruleset:
+	-->
+	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(advanced_image_search|imghp|.*tb(?:m=isch|s=sbi))"
+			to="https://www.google.$2/$3" />
+		<test url="http://www.google.ca/advanced_image_search" />
+		<test url="http://www.google.com/advanced_image_search" />
+		<test url="http://www.google.com.au/advanced_image_search" />
+		<test url="http://www.google.ca/imghp" />
+		<test url="http://www.google.com/imghp" />
+		<test url="http://www.google.com.au/imghp" />
+		<test url="http://www.google.ca/search?q=test&amp;biw=1440&amp;bih=725&amp;source=lnms&amp;tbm=isch" />
+		<test url="http://www.google.com/search?q=test&amp;biw=1440&amp;bih=725&amp;source=lnms&amp;tbm=isch" />
+		<test url="http://www.google.com.au/search?q=test&amp;biw=1440&amp;bih=725&amp;source=lnms&amp;tbm=isch" />
+		<!-- tbs=sbi afaik is the "Google Sorry" page, but I can't find a Google Images related URL for it -->
+		<test url="http://www.google.ca/search?tbs=sbi" />
+		<test url="http://www.google.com/search?tbs=sbi" />
+		<test url="http://www.google.com.au/search?tbs=sbi" />
 </ruleset>
diff --git a/src/chrome/content/rules/GoogleMaps.xml b/src/chrome/content/rules/GoogleMaps.xml
index 3b5d605cbfd5..b8b014f81110 100644
--- a/src/chrome/content/rules/GoogleMaps.xml
+++ b/src/chrome/content/rules/GoogleMaps.xml
@@ -1,6 +1,9 @@
 <!--
+Ignore this error if it ever happens again, it's ok. Please reenable this ruleset if it happens again.
 Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://maps-api-ssl.google.com/ (200) => https://maps-api-ssl.google.com/ (404)
+- - - - - -
+
 	Problematic domains:
 
 		- khms *
@@ -17,14 +20,15 @@ Non-2xx HTTP code: http://maps-api-ssl.google.com/ (200) => https://maps-api-ssl
 			- khms[0-3]
 
 -->
-<ruleset name="Google Maps" default_off='failed ruleset test'>
-
+<ruleset name="Google Maps">
 	<target host="maps.google.*" />
 		<!--
 			https://trac.torproject.org/projects/tor/ticket/8627
 										-->
 		<exclusion pattern="^http://maps\.google\.com/local_url" />
+			<test url="http://maps.google.com/local_url" />
 		<exclusion pattern="^http://maps\.google\.gr/transitathens" />
+			<test url="http://maps.google.gr/transitathens" />
 	<target host="maps.google.co.*" />
 	<target host="khms.google.com" />
 	<target host="khms0.google.com" />
@@ -37,9 +41,12 @@ Non-2xx HTTP code: http://maps-api-ssl.google.com/ (200) => https://maps-api-ssl
 	<target host="maps.googleapis.com" />
 		<!--
 			https://mail1.eff.org/pipermail/https-everywhere-rules/2012-September/001317.html
-														-->
-		<!--exclusion pattern="^http://maps\.googleapis\.com/map(files/lib/map_1_20\.swf|sapi/publicapi\?file=flashapi)" /-->
-		<exclusion pattern="^http://maps\.googleapis\.com/map(?:files/lib/map_\d+_\d+\.swf|sapi/publicapi\?file=flashapi)" />
+			These now 404
+		<exclusion pattern="^http://maps\.googleapis\.com/mapfiles/lib/map_\d+_\d+\.swf" />
+			<test url="http://maps.googleapis.com/mapfiles/lib/map_1_20.swf" />
+		<exclusion pattern="^http://maps\.googleapis\.com/mapsapi/publicapi\?file=flashapi" />
+			<test url="http://maps.googleapis.com/mapsapi/publicapi?file=flashapi" />
+		-->
 	<target host="maps.gstatic.com" />
 
 
@@ -49,8 +56,11 @@ Non-2xx HTTP code: http://maps-api-ssl.google.com/ (200) => https://maps-api-ssl
 	<securecookie host="^maps-api-ssl\.google\.com$" name=".+" />
 
 
-	<rule from="^http://maps\.google\.([^/]+)/"
+	<rule from="^http://maps\.google\.((?:com?\.)?\w{2,3})/"
 		to="https://maps.google.$1/" />
+		<test url="http://maps.google.ca/" />
+		<test url="http://maps.google.com/" />
+		<test url="http://maps.google.com.au/" />
 
 	<!--	http://khms.../$ 404s:
 					-->
@@ -60,10 +70,12 @@ Non-2xx HTTP code: http://maps-api-ssl.google.com/ (200) => https://maps-api-ssl
 	<rule from="^http://(khms\d?|maps-api-ssl|mw2)\.google\.com/"
 		to="https://$1.google.com/" />
 
-	<rule from="^http://maps\.g(oogleapis|static)\.com/"
-		to="https://maps.g$1.com/" />
-
-	<rule from="^https://maps\.googleapis\.com/map(?=files/lib/map_\d+_\d+\.swf|sapi/publicapi\?file=flashapi)"
-		to="http://maps.googleapis.com/map" downgrade="1" />
+	<rule from="^http://maps\.googleapis\.com/"
+		to="https://maps.googleapis.com/" />
 
+	<rule from="^http://maps\.gstatic\.com/"
+		to="https://maps.gstatic.com/" />
+	<!-- covered in exclusion rule, there should be no need to downgrade -->
+	<!--rule from="^https://maps\.googleapis\.com/map(?=files/lib/map_\d+_\d+\.swf|sapi/publicapi\?file=flashapi)"
+		to="http://maps.googleapis.com/map" downgrade="1" /-->
 </ruleset>
diff --git a/src/chrome/content/rules/GoogleSearch.xml b/src/chrome/content/rules/GoogleSearch.xml
deleted file mode 100644
index d287108dac1c..000000000000
--- a/src/chrome/content/rules/GoogleSearch.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<ruleset name="Google Search">
-
-	<target host="google.com" />
-	<target host="*.google.com" />
-	<target host="google.com.*" />
-	<target host="www.google.com.*" />
-	<target host="google.co.*" />
-	<target host="www.google.co.*" />
-	<target host="google.*" />
-	<target host="www.google.*" />
-	<!--
-		Beyond clients1 these do not currently
-		exist in the ccTLDs, but just in case...
-							-->
-	<target host="clients1.google.com.*" />
-	<target host="clients2.google.com.*" />
-	<target host="clients3.google.com.*" />
-	<target host="clients4.google.com.*" />
-	<target host="clients5.google.com.*" />
-	<target host="clients6.google.com.*" />
-	<target host="clients1.google.co.*" />
-	<target host="clients2.google.co.*" />
-	<target host="clients3.google.co.*" />
-	<target host="clients4.google.co.*" />
-	<target host="clients5.google.co.*" />
-	<target host="clients6.google.co.*" />
-	<target host="clients1.google.*" />
-	<target host="clients2.google.*" />
-	<target host="clients3.google.*" />
-	<target host="clients4.google.*" />
-	<target host="clients5.google.*" />
-	<target host="clients6.google.*" />
-
-
-	<!--	Some Google pages can generate naive links back to the
-		unencrypted version of encrypted.google.com, which is
-		a 301 but theoretically vulnerable to SSL stripping.
-									-->
-	<rule from="^http://encrypted\.google\.com/"
-		to="https://encrypted.google.com/" />
-
-	<!--	The most basic case.
-					-->
-	<rule from="^http://(?:www\.)?google\.com/search"
-		to="https://www.google.com/search" />
-
-	<!--	A very annoying exception that we
-		seem to need for the basic case
-						-->
-	<exclusion pattern="^http://(?:www\.)?google\.com/search.*tbs=shop" />
-	<exclusion pattern="^http://clients\d\.google\.com/.*client=products.*" />
-	<exclusion pattern="^http://suggestqueries\.google\.com/.*client=.*" />
-
-	<!-- https://trac.torproject.org/projects/tor/ticket/9713 
-				 -->
-
-	<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp" />
-
-
-	<!--	This is necessary for image results
-		links from web search results
-						-->
-	<exclusion pattern="^http://(?:www\.)?google\.com/search.*tbm=isch.*" />
-
-	<rule from="^http://(?:www\.)?google\.com/about"
-		to="https://www.google.com/about" />
-
-	<!--	There are two distinct cases for these firefox searches	-->
-
-	<rule from="^http://(?:www\.)?google(?:\.com?)?\.[a-z]{2}/firefox/?$"
-		to="https://www.google.com/" />
-
-	<rule from="^http://(?:www\.)?google(?:\.com?)?\.[a-z]{2}/firefox"
-		to="https://www.google.com/webhp" />
-
-	<rule from="^http://(?:www\.)?google\.com/webhp"
-		to="https://www.google.com/webhp" />
-
-	<rule from="^http://codesearch\.google\.com/"
-		to="https://codesearch.google.com/" />
-
-	<rule from="^http://(?:www\.)?google\.com/codesearch"
-		to="https://www.google.com/codesearch" />
-
-	<rule from="^http://(?:www\.)?google\.com/#"
-		to="https://www.google.com/#" />
-
-	<rule from="^http://(?:www\.)?google\.com/$"
-		to="https://www.google.com/" />
-
-	<!--	Google supports IPv6 search, including
-		HTTPS with a valid certificate!	-->
-	<rule from="^http://ipv6\.google\.com/"
-		to="https://ipv6.google.com/" />
-
-	<!--	most google international sites look like
-		"google.fr", some look like "google.co.jp",
-		and some crazy ones like "google.com.au"	-->
-
-	<rule from="^http://(www\.)?google(\.com?)?\.([a-z]{2})/(search\?|#)"
-		to="https://$1google$2.$3/$4" />
-
-	<!--	Language preference setting	-->
-	<rule from="^http://(www\.)?google(\.com?)?\.([a-z]{2})/setprefs"
-	to="https://$1google$2.$3/setprefs" />
-
-	<!--	Completion urls look like this:
-
-http://clients2.google.co.jp/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1 HTTP/1.1\r\n
-
-		-->
-	<rule from="^http://clients\d\.google\.com/complete/search"
-		to="https://clients1.google.com/complete/search" />
-
-	<rule from="^http://clients\d\.google(\.com?\.[a-z]{2})/complete/search"
-		to="https://clients1.google.$1/complete/search" />
-
-	<rule from="^http://clients\d\.google\.([a-z]{2})/complete/search"
-		to="https://clients1.google.$1/complete/search" />
-
-	<rule from="^http://suggestqueries\.google\.com/complete/search"
-		to="https://clients1.google.com/complete/search" />
-
-	<rule from="^http://(www\.)?google\.(com?\.)?([a-z]{2})/(?:webhp)?$"
-		to="https://$1google.$2$3/" />
-
-	<!--	If there are URL parameters, keep them.	-->
-	<rule from="^http://(www\.)?google\.(com?\.)?([a-z]{2})/(?:webhp)?\?"
-		to="https://$1google.$2$3/webhp?" />
-
-	<!-- teapot -->
-	<rule from="^http://(www\.)?google(\.com?)?\.([a-z]{2})/teapot"
-		to="https://$1google$2.$3/teapot" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 58a388d08bb3..670a6b4320e7 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -1,8 +1,8 @@
 <!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://googleusercontent.com/ => http://googleusercontent.com/: (6, 'Could not resolve host: googleusercontent.com')
-	Other Google rulesets:
+	Rules that are simple to write go in here, for everything else
+	See GoogleServices.xml
 
+	Other Google rulesets:
 		- 2mdn.net.xml
 		- Admeld.xml
 		- Android.xml
@@ -12,10 +12,13 @@ Fetch error: http://googleusercontent.com/ => http://googleusercontent.com/: (6,
 		- Doubleclick.net.xml
 		- FeedBurner.xml
 		- Go_Lang.org.xml
+		- Google.com_Subdomains.xml
+		- Google.com_Subdomains_Complex.html
 		- Google.org.xml
 		- GoogleAPIs.xml
 		- Google_App_Engine.xml
 		- GoogleImages.xml
+		- GoogleServices_Complex.xml (Simple rules that normally would reside here are in this ruleset)
 		- GoogleShopping.xml
 		- Ingress.xml
 		- Made_with_Code.com.xml
@@ -25,341 +28,28 @@ Fetch error: http://googleusercontent.com/ => http://googleusercontent.com/: (6,
 		- Postini.xml
 		- WebM_Project.org.xml
 		- With_Google.com.xml
-
-
-	Nonfunctional domains:
-
-		- partnerpage.google.com *
-		- picasa.google.com *
-		- www.picasa.google.com ²
-		- safebrowsing.clients.google.com	(404, mismatched)
-		- (www.)googlesyndicatedsearch.com	(404; mismatched, CN: google.com)
-		- buttons.googlesyndication.com *
-
-	* 404, valid cert
-	² 404; mismatched, CN: www.google.com
-
-
-	Nonfunctional google.com paths:
-
-		- analytics	(redirects to http)
-		- imgres
-		- gadgets *
-		- u/		(404)
-
-	* Redirects to http
-
-
-	Problematic domains:
-
-		- www.goo.gl		(404; mismatched, CN: *.google.com)
-
-		- www.news.google.ca ²
-
-		- google.com subdomains:
-
-			- cbks0 ****
-			- earth *
-			- gg		($ 404s)
-			- knoll *
-			- scholar **
-			- trends *
-
-		- news.google.cctld **
-		- scholar.google.cctld **
-		- *-opensocial.googleusercontent.com ***
-
-	² Mismatched, CN: google.com
-	**** $ 404s
-	* 404, valid cert
-	** Redirects to http, valid cert
-	*** Breaks followers widget - https://trac.torproject.org/projects/tor/ticket/7294
-
-
-	Partially covered domains:
-
-		- google.cctld subdomains:
-
-			- scholar	(→ www)
-
-		- google.com subdomains:
-
-			- (www.)
-			- cbks0		($ 404s)
-			- gg		($ 404s)
-			- news		(→ www)
-			- scholar	(→ www)
-
-		- *.googleusercontent.com	(*-opensocial excluded)
-
-
-	Fully covered domains:
-
-		- lh[3-6].ggpht.com
-		- (www.)goo.gl		(www → ^)
-
-		- google.com subdomains:
-
-			- accounts
-			- admin
-			- adwords
-			- apis
-			- appengine
-			- calendar
-			- checkout
-			- chrome
-			- clients[12]
-			- cloud
-			- code
-			- *.corp
-			- developers
-			- dl
-			- docs
-			- docs\d
-			- \d.docs
-			- domains
-			- drive
-			- earth		(→ www)
-			- encrypted
-			- encrypted-tbn[123]
-			- feedburner
-			- feedproxy
-			- fiber
-			- finance
-			- glass
-			- goto
-			- groups
-			- health
-			- helpouts
-			- history
-			- hostedtalkgadget
-			- id
-			- investor
-			- ipv4
-			- knol
-			- knoll		(→ knol)
-			- lh\d
-			- mail
-			- chatenabled.mail
-			- pack
-			- picasaweb
-			- pki
-			- play
-			- plus
-			- plusone
-			- productforums
-			- profiles
-			- safebrowsing-cache
-			- cert-test.sandbox
-			- plus.sandbox
-			- sb-ssl
-			- script
-			- security
-			- services
-			- servicessites
-			- sites
-			- spreadsheets
-			- spreadsheets\d
-			- support
-			- talk
-			- talkgadget
-			- tbn2			(→ encrypted-tbn2)
-			- tools
-			- trends		(→ www)
-			- wallet
-
-		- partner.googleadservices.com
-		- (www.)googlecode.com
-		- *.googlecode.com	(per-project subdomains)
-		- googlesource.com
-		- *.googlesource.com
-		- pagead2.googlesyndication.com
-		- tpc.googlesyndication.com
-		- mail-attachment.googleusercontent.com
-		- webcache.googleusercontent.com
-
-
-	Insecure cookies are set for these domains:
-
-		- .google.com
-
-
-	XXX: Needs more testing
-
 -->
-<ruleset name="Google Services" default_off='failed ruleset test'>
-
-	<target host="*.ggpht.com" />
-	<target host="gmail.com" />
-	<target host="www.gmail.com" />
-	<target host="goo.gl" />
-	<target host="www.goo.gl" />
-	<target host="google.*" />
-	<target host="accounts.google.*" />
-	<target host="adwords.google.*" />
-	<target host="finance.google.*" />
-	<target host="groups.google.*" />
-	<target host="it.google.*" />
-	<target host="news.google.*" />
-		<exclusion pattern="^http://(?:news\.)?google\.com?(?:\.[a-z][a-z])?/(?:archivesearch|newspapers)" />
-	<target host="picasaweb.google.*" />
-	<target host="scholar.google.*" />
-	<target host="www.google.*" />
-	<target host="*.google.ca" />
-	<target host="google.co.*" />
-	<target host="accounts.google.co.*" />
-	<target host="adwords.google.co.*" />
-	<target host="finance.google.co.*" />
-	<target host="groups.google.co.*" />
-	<target host="id.google.co.*" />
-	<target host="news.google.co.*" />
-	<target host="picasaweb.google.co.*" />
-	<target host="scholar.google.co.*" />
-	<target host="www.google.co.*" />
-	<target host="google.com" />
-	<target host="*.google.com" />
-		<exclusion pattern="^http://(?:www\.)?google\.com/analytics/*(?:/[^/]+)?(?:\?.*)?$" />
-		<exclusion pattern="^http://cbks0\.google\.com/(?:$|\?)" />
-		<exclusion pattern="^http://gg\.google\.com/(?!csi(?:$|\?))" />
-	<target host="google.com.*" />
-	<target host="accounts.google.com.*" />
-	<target host="adwords.google.com.*" />
-	<target host="groups.google.com.*" />
-	<target host="id.google.com.*" />
-	<target host="news.google.com.*" />
-	<target host="picasaweb.google.com.*" />
-	<target host="scholar.google.com.*" />
-	<target host="www.google.com.*" />
+<ruleset name="Google Services Simple">
 	<target host="partner.googleadservices.com" />
-	<target host="googlecode.com" />
-	<target host="*.googlecode.com" />
-	<target host="googlemail.com" />
-	<target host="www.googlemail.com" />
-	<target host="googlesource.com" />
-	<target host="*.googlesource.com" />
-	<target host="*.googlesyndication.com" />
-	<target host="www.googletagservices.com" />
-	<target host="googleusercontent.com" />
-	<target host="*.googleusercontent.com" />
-		<!--
-			Necessary for the Followers widget:
+	<target host="pagead2.googlesyndication.com" />
+	<target host="tpc.googlesyndication.com" />
 
-				 https://trac.torproject.org/projects/tor/ticket/7294
-											-->
-		<exclusion pattern="http://[^@:\./]+-opensocial\.googleusercontent\.com" />
+	<target host="googletagmanager.com" />
+	<target host="www.googletagmanager.com" />
 
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^\.google\.com$" name="^(APISID|HSID|NID|PREF|SID)$" /-->
-	<!--
-		Can we secure any of these wildcard cookies safely?
-									-->
-	<!--securecookie host="^\.google\.com$" name="^(hl|I4SUserLocale|NID|PREF|S)$" /-->
-	<!--securecookie host="^\.google\.[\w.]{2,6}$" name="^(hl|I4SUserLocale|NID|PREF|S|S_awfe)$" /-->
-	<securecookie host="^(?:accounts|adwords|\.code|login\.corp|developers|docs|\d\.docs|fiber|mail|picasaweb|plus|\.?productforums|support)\.google\.[\w.]{2,6}$" name=".+" />
-	<securecookie host="^www\.google\.com$" name="^GoogleAccountsLocale_session$" />
-	<securecookie host="^mail-attachment\.googleusercontent\.com$" name=".+" />
+	<!-- Gmail -->
+	<target host="gmail.com" />
+		<target host="www.gmail.com" />
+	<target host="googlemail.com" />
+		<target host="www.googlemail.com" />
 	<securecookie host="^gmail\.com$" name=".+" />
 	<securecookie host="^www\.gmail\.com$" name=".+" />
 	<securecookie host="^googlemail\.com$" name=".+" />
 	<securecookie host="^www\.googlemail\.com$" name=".+" />
 
+	<!-- !www doesn't exist -->
+	<target host="www.googletagservices.com" />
 
-	<!--    - lh 3-6 exist
-		- All appear identical
-		- Identical to lh\d.googleusercontent.com
-					-->
-	<rule from="^http://lh(\d)\.ggpht\.com/"
-		to="https://lh$1.ggpht.com/" />
-
-	<rule from="^http://lh(\d)\.google\.ca/"
-		to="https://lh$1.google.ca/" />
-
-
-	<rule from="^http://(www\.)?g(oogle)?mail\.com/"
-		to="https://$1g$2mail.com/" />
-
-	<rule from="^http://(?:www\.)?goo\.gl/"
-		to="https://goo.gl/" />
-
-	<!--	tisp$ 404s:
-				-->
-	<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/tisp(?=$|\?)"
-		to="https://www.google.$1/tisp/" />
-
-	<!--	Paths that work on all in google.*
-							-->
-	<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/(accounts|adplanner|ads|adsense|adwords|analytics|bookmarks|books|chrome|chromecast|contacts|coop|cse|css|culturalinstitute|doodles|earth|favicon\.ico|finance|get|goodtoknow|googleblogs|grants|green|hangouts|hostednews|images|intl|js|landing|logos|mapmaker|newproducts|news|nexus|patents|policies|prdhp|profiles|products|reader|s2|script|settings|shopping|support|tisp|tools|transparencyreport|trends|urchin|webmasters)(?=$|[?/])"
-		 to="https://www.google.$1/$2" />
-
-	<!--	Paths that 404 on .ccltd, but work on .com:
-								-->
-	<rule from="^http://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
-		 to="https://www.google.com/" />
-
-	<rule from="^http://(?:www\.)?google\.(?:com?\.)?\w{2,3}/custom"
-		 to="https://www.google.com/cse" />
-
-	<!--	Paths that only exist/work on .com
-							-->
-	<rule from="^http://(?:www\.)?google\.com/(\+|appsstatus|buzz|chat|chromeos|extern_js|glass|googlebooks|ig|insights|moderator|phone|safebrowsing|videotargetting|webfonts)(?=$|[?/])"
-		to="https://www.google.com/$1" />
-
-	<!--	Subdomains that work on all in google.*
-							-->
-	<rule from="^http://(accounts|adwords|finance|groups|id|picasaweb|)\.google\.((?:com?\.)?\w{2,3})/"
-		to="https://$1.google.$2/" />
-
-	<!--	Subdomains that only exist/work on .com
-							-->
-	<rule from="^http://(admin|apis|appengine|calendar|cast|cbks0|chat|checkout|chrome|clients[12]|cloud|code|[\w-]+\.corp|developers|dl|docs\d?|\d\.docs|drive|encrypted|encrypted-tbn[123]|feedburner|feedproxy|fiber|fonts|gg|glass||goto|health|helpouts|history|(?:hosted)?talkgadget|investor|ipv4|lh\d|(?:chatenabled\.)?mail|pack|pki|play|plus(?:\.sandbox)?|plusone|productforums|profiles|safebrowsing-cache|cert-test\.sandbox|sb-ssl|script|security|services|servicessites|sites|spreadsheets\d?|support|talk|tools|wallet)\.google\.com/"
-		to="https://$1.google.com/" />
-
-	<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
-
-	<rule from="^http://earth\.google\.com/"
-		to="https://www.google.com/earth/" />
-
-	<rule from="^http://scholar\.google\.((?:com?\.)?\w{2,3})/intl/"
-		to="https://www.google.$1/intl/" />
-
-	<rule from="^http://(?:encrypted-)?tbn2\.google\.com/"
-		to="https://encrypted-tbn2.google.com/" />
-
-
-	<rule from="^http://knoll?\.google\.com/"
-		to="https://knol.google.com/" />
-
-
-	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
-		to="https://www.google.com/news" />
-
-	<rule from="^http://trends\.google\.com/"
-		 to="https://www.google.com/trends" />
-
-
-	<rule from="^http://([^/:@\.]+\.)?googlecode\.com/"
-		 to="https://$1googlecode.com/" />
-
-	<rule from="^http://([^\./]\.)?googlesource\.com/"
-		to="https://$1googlesource.com/" />
-
-
-	<rule from="^http://partner\.googleadservices\.com/"
-		 to="https://partner.googleadservices.com/" />
-
-	<rule from="^http://(pagead2|tpc)\.googlesyndication\.com/"
-		 to="https://$1.googlesyndication.com/" />
-
-	<!--	!www doesn't exist.
-					-->
-	<rule from="^http://www\.googletagservices\.com/tag/js/"
-		to="https://www.googletagservices.com/tag/js/" />
-
-
-	<rule from="^http://([^@:\./]+)\.googleusercontent\.com/"
-		to="https://$1.googleusercontent.com/" />
-	
-
-</ruleset>
+	<rule from="^http:"
+			to="https:" />
+</ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/GoogleServices_Complex.xml b/src/chrome/content/rules/GoogleServices_Complex.xml
new file mode 100644
index 000000000000..936674b77bff
--- /dev/null
+++ b/src/chrome/content/rules/GoogleServices_Complex.xml
@@ -0,0 +1,78 @@
+<!--
+	For other Google coverage, see GoogleServices.xml
+
+	Problematic domains:
+
+		- www.goo.gl		(404; mismatched, CN: *.google.com)
+		- *-opensocial.googleusercontent.com ***
+
+	*** Breaks followers widget - https://trac.torproject.org/projects/tor/ticket/7294
+-->
+<ruleset name="Google Services">
+	<target host="*.ggpht.com" />
+	<target host="goo.gl" />
+	<target host="www.goo.gl" />
+		<exclusion pattern="^http://cbks0\.google\.com/(?:$|\?)" />
+			<test url="http://cbks0.google.com/" />
+			<test url="http://cbks0.google.com/?" />
+			<test url="http://cbks0.google.com/?foo" />
+		<exclusion pattern="^http://gg\.google\.com/(?!csi(?:$|\?))" />
+			<test url="http://gg.google.com/" />
+			<test url="http://gg.google.com/foo" />
+			<test url="http://gg.google.com/foo?" />
+			<test url="http://gg.google.com/foo?bar" />
+	<target host="googlecode.com" />
+	<target host="*.googlecode.com" />
+	<target host="googlesource.com" />
+	<target host="*.googlesource.com" />
+	<target host="*.googlesyndication.com" />
+	<target host="*.googleusercontent.com" />
+		<target host="*.corp.googleusercontent.com" />
+		<!--
+			Necessary for the Followers widget:
+
+				 https://trac.torproject.org/projects/tor/ticket/7294
+											-->
+		<exclusion pattern="http://[^@:\./]+-opensocial\.googleusercontent\.com" />
+			<test url="http://foo-opensocial.googleusercontent.com" />
+			<test url="http://bar-opensocial.googleusercontent.com" />
+			<test url="http://foobar-opensocial.googleusercontent.com" />
+
+	<securecookie host="^mail-attachment\.googleusercontent\.com$" name=".+" />
+
+	<!--    - lh 3-6 exist
+		- All appear identical
+		- Identical to lh\d.googleusercontent.com
+					-->
+	<rule from="^http://lh(\d)\.ggpht\.com/"
+		to="https://lh$1.ggpht.com/" />
+		<test url="http://lh3.ggpht.com/" />
+		<test url="http://lh4.ggpht.com/" />
+		<test url="http://lh5.ggpht.com/" />
+		<test url="http://lh6.ggpht.com/" />
+
+	<rule from="^http://(www\.)?goo\.gl/"
+		to="https://goo.gl/" />
+		<test url="http://www.goo.gl/" />
+		<test url="http://goo.gl/" />
+
+	<!-- wildcards -->
+
+	<rule from="^http://([^@:\./]+)\.googleusercontent\.com/"
+		to="https://$1.googleusercontent.com/" />
+		<test url="http://webcache.googleusercontent.com/" />
+		<test url="http://foo.googleusercontent.com/" />
+		<test url="http://bar.googleusercontent.com/" />
+
+	<rule from="^http://([^/:@\.]+\.)?googlecode\.com/"
+		 to="https://$1googlecode.com/" />
+		<test url="http://foo.googlecode.com/" />
+		<test url="http://bar.googlecode.com/" />
+		<test url="http://www.googlecode.com/" />
+
+	<rule from="^http://([^@:\./]+\.)?googlesource\.com/"
+		to="https://$1googlesource.com/" />
+		<test url="http://foo.googlesource.com/" />
+		<test url="http://bar.googlesource.com/" />
+		<test url="http://www.googlesource.com/" />
+</ruleset>
diff --git a/src/chrome/content/rules/GoogleSorry.xml b/src/chrome/content/rules/GoogleSorry.xml
index eae11e08266a..1a396f437ca6 100644
--- a/src/chrome/content/rules/GoogleSorry.xml
+++ b/src/chrome/content/rules/GoogleSorry.xml
@@ -1,7 +1,15 @@
-<ruleset name="GoogleSorry">
-  <target host="sorry.google.com" />
-  <target host="www.google.com" />
-  <target host="google.com" />
+<ruleset name="Google Sorry">
+	<target host="sorry.google.com" />
+	<target host="www.google.com" />
+	<target host="google.com" />
+		<!-- need this due to test-ruleset-coverage.sh -->
+		<exclusion pattern="^http://(www\.)?google.com/$" />
 
-  <rule from="^http://(?:sorry\.|www\.)?google\.com/sorry/" to="https://sorry.google.com/sorry/" />
+	<rule from="^http://(www\.)?google\.com/sorry/"
+			to="https://sorry.google.com/sorry/" />
+		<test url="http://google.com/sorry/" />
+		<test url="http://www.google.com/sorry/" />
+
+	<rule from="^http://sorry\.google\.com/"
+			to="https://sorry.google.com/" />
 </ruleset>