5 files changed, 6 insertions, 11 deletions
diff --git a/accessible/atk/Platform.cpp b/accessible/atk/Platform.cpp
index e64084f5a..0ee3a3d97 100644
--- a/accessible/atk/Platform.cpp
+++ b/accessible/atk/Platform.cpp
@@ -60,11 +60,7 @@ struct GnomeAccessibilityModule
 };
 
 static GnomeAccessibilityModule sAtkBridge = {
-#ifdef AIX
-    "libatk-bridge.a(libatk-bridge.so.0)", nullptr,
-#else
     "libatk-bridge.so", nullptr,
-#endif
     "gnome_accessibility_module_init", nullptr,
     "gnome_accessibility_module_shutdown", nullptr
 };
diff --git a/accessible/tests/mochitest/common.js b/accessible/tests/mochitest/common.js
index 1e48fa067..b3f83ea84 100644
--- a/accessible/tests/mochitest/common.js
+++ b/accessible/tests/mochitest/common.js
@@ -59,7 +59,6 @@ const nsIPropertyElement = Components.interfaces.nsIPropertyElement;
 
 const MAC = (navigator.platform.indexOf("Mac") != -1);
 const LINUX = (navigator.platform.indexOf("Linux") != -1);
-const SOLARIS = (navigator.platform.indexOf("SunOS") != -1);
 const WIN = (navigator.platform.indexOf("Win") != -1);
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/accessible/tests/mochitest/elm/test_nsApplicationAcc.html b/accessible/tests/mochitest/elm/test_nsApplicationAcc.html
index 58763e437..e23eb37bc 100644
--- a/accessible/tests/mochitest/elm/test_nsApplicationAcc.html
+++ b/accessible/tests/mochitest/elm/test_nsApplicationAcc.html
@@ -32,7 +32,7 @@
 
       // nsIAccessible::name
       var applicationName = "";
-      if (LINUX || SOLARIS) {
+      if (LINUX) {
         applicationName = appInfo.name;
       } else {
         try {
diff --git a/accessible/tests/mochitest/treeupdate/test_contextmenu.xul b/accessible/tests/mochitest/treeupdate/test_contextmenu.xul
index 5b31e0136..916b815eb 100644
--- a/accessible/tests/mochitest/treeupdate/test_contextmenu.xul
+++ b/accessible/tests/mochitest/treeupdate/test_contextmenu.xul
@@ -130,7 +130,7 @@
      */
     function getMenuTree1()
     {
-      if (LINUX || SOLARIS) {
+      if (LINUX) {
         var tree = {
           role: ROLE_MENUPOPUP,
           children: [
@@ -190,7 +190,7 @@
     function getMenuTree2()
     {
       var tree = getMenuTree1();
-      if (LINUX || SOLARIS) {
+      if (LINUX) {
         var submenuTree =
         {
           name: "item2.0",
@@ -232,7 +232,7 @@
         children: []
       };
 
-      if (LINUX || SOLARIS)
+      if (LINUX)
         tree.children[2].children[0].children.push(subsubmenuTree);
       else
         tree.children[2].children[0].children[0].children[0].children.push(subsubmenuTree);
diff --git a/accessible/tests/mochitest/treeupdate/test_menu.xul b/accessible/tests/mochitest/treeupdate/test_menu.xul
index abdea217e..d62ac8c5d 100644
--- a/accessible/tests/mochitest/treeupdate/test_menu.xul
+++ b/accessible/tests/mochitest/treeupdate/test_menu.xul
@@ -32,7 +32,7 @@
       this.invoke = function openMenu_invoke()
       {
         var tree;
-        if (LINUX || SOLARIS) {
+        if (LINUX) {
           tree =
             { PARENT_MENUITEM: [ ] };
 
@@ -51,7 +51,7 @@
       this.finalCheck = function openMenu_finalCheck()
       {
         var tree;
-        if (LINUX || SOLARIS) {
+        if (LINUX) {
           tree =
             { PARENT_MENUITEM: [
               { MENUITEM: [ ] },