diff --git a/mozilla/testing/performance/talos/run_tests.py b/mozilla/testing/performance/talos/run_tests.py
index 2d73ef5a0a5..92fc3cae201 100755
--- a/mozilla/testing/performance/talos/run_tests.py
+++ b/mozilla/testing/performance/talos/run_tests.py
@@ -63,6 +63,8 @@ def shortName(name):
     return "pbytes"
   elif name == "RSS":
     return "rss"
+  elif name == "XRes":
+    return "xres"
   else: 
     return name
 
@@ -240,7 +242,7 @@ def results_from_graph(links, results_server):
   first_results = 'RETURN:<br>'
   last_results = '' 
   full_results = '\nRETURN:<p style="font-size:smaller;">Details:<br>'  
-  memory_metric = ['memset', 'rss', 'pbytes']
+  memory_metric = ['memset', 'rss', 'pbytes', 'xres']
   lines = links.split('\n')
   for line in lines:
     if line == "":
diff --git a/mozilla/testing/performance/talos/sample.config b/mozilla/testing/performance/talos/sample.config
index 18f09f8f5e2..e5c4fd28166 100755
--- a/mozilla/testing/performance/talos/sample.config
+++ b/mozilla/testing/performance/talos/sample.config
@@ -71,8 +71,10 @@ env :
 #  counters    : (REQUIRED) types of system activity to monitor during test run, can be empty 
 #            For possible values of counters argument on Windows, see
 #            http://technet2.microsoft.com/WindowsServer/en/Library/86b5d116-6fb3-427b-af8c-9077162125fe1033.mspx?mfr=true
-#            Possible values on Linux and Mac:
+#            Possible values on Mac:
 #            counters : ['Private Bytes', 'RSS']
+#            Possible values on Linux:
+#            counters : ['Private Bytes', 'RSS', 'XRes']
 #            Standard windows values:
 #            counters : ['Working Set', 'Private Bytes', '% Processor Time']
 
@@ -87,7 +89,8 @@ tests :
   cycles : 20
   timeout: 150
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : True
   profile_path: base_profile
 - name: ts_cold
@@ -97,7 +100,8 @@ tests :
   cycles : 20
   timeout: 150
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : True
   profile_path: base_profile
   head: scripts/ts_cold/head.py
@@ -108,7 +112,8 @@ tests :
   cycles : 20
   timeout: 150
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : True
   profile_path: places_generated_max
 - name: ts_places_generated_min 
@@ -118,7 +123,8 @@ tests :
   cycles : 20
   timeout: 150
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : True
   profile_path: places_generated_min
 - name: ts_places_generated_med 
@@ -128,7 +134,8 @@ tests :
   cycles : 20
   timeout: 150
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : True
   profile_path: places_generated_med
 - name: tp 
@@ -136,7 +143,8 @@ tests :
   resolution : 20
   cycles : 1
   win_counters : ['Working Set', 'Private Bytes', '% Processor Time']
-  unix_counters : [ 'Private Bytes', 'RSS']
+  linux_counters : [ 'Private Bytes', 'RSS', 'Xres']
+  mac_counters : [ 'Private Bytes', 'RSS']
   shutdown : True
   profile_path: base_profile
 - name: tp4 
@@ -144,7 +152,8 @@ tests :
   resolution : 20
   cycles : 1
   win_counters : ['Working Set', 'Private Bytes', '% Processor Time']
-  unix_counters : [ 'Private Bytes', 'RSS']
+  linux_counters : [ 'Private Bytes', 'RSS', 'XRes']
+  mac_counters : [ 'Private Bytes', 'RSS']
   shutdown : True
   profile_path: base_profile
 - name: tp_js 
@@ -152,7 +161,8 @@ tests :
   resolution : 1
   cycles : 1
   win_counters : ['Working Set', 'Private Bytes', '% Processor Time']
-  unix_counters : [ 'Private Bytes', 'RSS']
+  linux_counters : [ 'Private Bytes', 'RSS', 'XRes']
+  mac_counters : [ 'Private Bytes', 'RSS']
   shutdown : False
   profile_path: base_profile
 - name: tdhtml
@@ -160,7 +170,8 @@ tests :
   resolution : 1
   cycles : 1
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
   profile_path: base_profile
 - name: tgfx
@@ -168,7 +179,8 @@ tests :
   resolution : 1
   cycles : 1
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
   profile_path: base_profile
 - name: tsvg
@@ -176,7 +188,8 @@ tests :
   resolution : 1
   cycles : 1
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
   profile_path: base_profile
 - name: tsvg_opacity
@@ -184,7 +197,8 @@ tests :
   resolution : 1
   cycles : 1
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
   profile_path: base_profile
 - name: v8 
@@ -192,7 +206,8 @@ tests :
   resolution : 20
   cycles : 1
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
   profile_path: base_profile
 - name: twinopen
@@ -201,7 +216,8 @@ tests :
   cycles : 1
   timeout : 300
   win_counters: []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
   profile_path: base_profile
 - name: tjss
@@ -209,7 +225,8 @@ tests :
   resolution : 1
   cycles : 1
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
   profile_path: base_profile
 - name: tsspider
@@ -217,6 +234,7 @@ tests :
   resolution : 1
   cycles : 1
   win_counters : []
-  unix_counters : []
+  linux_counters : []
+  mac_counters : []
   shutdown : False
   profile_path: base_profile
diff --git a/mozilla/testing/performance/talos/ttest.py b/mozilla/testing/performance/talos/ttest.py
index 24286b66d85..d6f0138a6c1 100644
--- a/mozilla/testing/performance/talos/ttest.py
+++ b/mozilla/testing/performance/talos/ttest.py
@@ -67,13 +67,13 @@ import ffsetup
 
 if platform.system() == "Linux":
     from cmanager_linux import *
-    platform_type = 'unix_'
+    platform_type = 'linux_'
 elif platform.system() in ("Windows", "Microsoft"):
     from cmanager_win32 import *
     platform_type = 'win_'
 elif platform.system() == "Darwin":
     from cmanager_mac import *
-    platform_type = 'unix_'
+    platform_type = 'mac_'
 
 
 # Regular expression for getting results from most tests