diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js
index f7a4b69e1dab..15f850b69245 100644
--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -820,8 +820,10 @@ pref("devtools.debugger.unix-domain-socket", "/data/local/debugger-socket");
 
 // enable Skia/GL (OpenGL-accelerated 2D drawing) for large enough 2d canvases,
 // falling back to Skia/software for smaller canvases
+#ifdef MOZ_WIDGET_GONK
 pref("gfx.canvas.azure.backends", "skia");
 pref("gfx.canvas.azure.accelerated", true);
+#endif
 
 // Turn on dynamic cache size for Skia
 pref("gfx.canvas.skiagl.dynamic-cache", true);
diff --git a/content/canvas/test/test_canvas.html b/content/canvas/test/test_canvas.html
index 2bc155bdfd53..9a6bfefcd34d 100644
--- a/content/canvas/test/test_canvas.html
+++ b/content/canvas/test/test_canvas.html
@@ -20,7 +20,14 @@ function IsD2DEnabled() {
 }
 
 function IsLinux() {
-    return navigator.platform.indexOf("Linux") == 0 &&
+    var os = "";
+
+    try {
+        os = Cc["@mozilla.org/xre/app-info;1"]
+          .getService(SpecialPowers.Ci.nsIXULRuntime).OS;
+    } catch (e) {}
+
+    return os.indexOf("Linux") == 0 &&
            navigator.appVersion.indexOf("Android") == -1;
 }