diff --git a/mozilla/build/pgo/Makefile.in b/mozilla/build/pgo/Makefile.in
index 4a54d75cc40..bb63b3c27fb 100644
--- a/mozilla/build/pgo/Makefile.in
+++ b/mozilla/build/pgo/Makefile.in
@@ -62,6 +62,9 @@ else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
+ifeq ($(MOZ_BUILD_APP),camino)
+browser_path = \"$(DIST)/Camino.app/Contents/MacOS/Camino\"
+else
 ifeq ($(OS_ARCH),Darwin)
 ifdef MOZ_DEBUG
 browser_path = \"$(DIST)/$(MOZ_APP_DISPLAYNAME)Debug.app/Contents/MacOS/$(PROGRAM)\"
@@ -71,6 +74,7 @@ endif
 else
 browser_path = \"$(DIST)/bin/$(PROGRAM)\"
 endif
+endif
 
 AUTOMATION_PPARGS = 	\
 			-DBROWSER_PATH=$(browser_path) \
@@ -83,6 +87,12 @@ else
 AUTOMATION_PPARGS += -DIS_MAC=0
 endif
 
+ifeq ($(MOZ_BUILD_APP),camino)
+AUTOMATION_PPARGS += -DIS_CAMINO=1
+else
+AUTOMATION_PPARGS += -DIS_CAMINO=0
+endif
+
 ifeq ($(host_os), cygwin)
 AUTOMATION_PPARGS += -DIS_CYGWIN=1
 endif
diff --git a/mozilla/build/pgo/automation.py.in b/mozilla/build/pgo/automation.py.in
index 2a0f6d7deec..bc2e12184a5 100644
--- a/mozilla/build/pgo/automation.py.in
+++ b/mozilla/build/pgo/automation.py.in
@@ -120,6 +120,7 @@ unprivilegedServers = [
 #else
 IS_CYGWIN = False
 #endif
+#expand IS_CAMINO = __IS_CAMINO__ != 0
 
 UNIXISH = not IS_WIN32 and not IS_MAC
 
@@ -242,6 +243,8 @@ user_pref("accessibility.typeaheadfind.autostart", false);
 user_pref("javascript.options.showInConsole", true);
 user_pref("layout.debug.enable_data_xbl", true);
 user_pref("browser.EULA.override", true);
+
+user_pref("camino.warn_when_closing", false); // Camino-only, harmless to others
 """
   prefs.append(part)
 
@@ -286,6 +289,8 @@ function FindProxyForURL(url, host)
   part = """
 user_pref("network.proxy.type", 2);
 user_pref("network.proxy.autoconfig_url", "%(pacURL)s");
+
+user_pref("camino.use_system_proxy_settings", false); // Camino-only, harmless to others
 """ % {"pacURL": pacURL}
   prefs.append(part)
 
@@ -306,7 +311,7 @@ def runApp(testURL, env, app, profileDir, extraArgs):
 
   # now run with the profile we created
   cmd = app
-  if IS_MAC and not cmd.endswith("-bin"):
+  if IS_MAC and not IS_CAMINO and not cmd.endswith("-bin"):
     cmd += "-bin"
   cmd = os.path.abspath(cmd)
 
@@ -319,7 +324,11 @@ def runApp(testURL, env, app, profileDir, extraArgs):
   else:
     profileDirectory = profileDir + "/"
 
-  args.extend(("-no-remote", "-profile", profileDirectory, testURL))
+  args.extend(("-no-remote", "-profile", profileDirectory))
+  if IS_CAMINO:
+    args.extend(("-url", testURL))
+  else:
+    args.append((testURL))
   args.extend(extraArgs)
   proc = Process(cmd, args, env = env)
   log.info("Application pid: %d", proc.pid)
diff --git a/mozilla/testing/mochitest/Makefile.in b/mozilla/testing/mochitest/Makefile.in
index d35815774af..a67103f5a5d 100644
--- a/mozilla/testing/mochitest/Makefile.in
+++ b/mozilla/testing/mochitest/Makefile.in
@@ -80,6 +80,9 @@ else
 PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 endif
 
+ifeq ($(MOZ_BUILD_APP),camino)
+browser_path = \"../$(DIST)/Camino.app/Contents/MacOS/Camino\"
+else
 ifeq ($(OS_ARCH),Darwin)
 ifdef MOZ_DEBUG
 browser_path = \"../$(DIST)/$(MOZ_APP_DISPLAYNAME)Debug.app/Contents/MacOS/$(PROGRAM)\"
@@ -89,6 +92,7 @@ endif
 else
 browser_path = \"../$(DIST)/bin/$(PROGRAM)\"
 endif
+endif
 
 # These go in _tests/ so they need to go up an extra path segement
 TEST_DRIVER_PPARGS = 	\
@@ -102,6 +106,12 @@ else
 TEST_DRIVER_PPARGS += -DIS_MAC=0
 endif
 
+ifeq ($(MOZ_BUILD_APP),camino)
+TEST_DRIVER_PPARGS += -DIS_CAMINO=1
+else
+TEST_DRIVER_PPARGS += -DIS_CAMINO=0
+endif
+
 ifeq ($(host_os), cygwin)
 TEST_DRIVER_PPARGS += -DIS_CYGWIN=1
 endif