diff --git a/test/ProblemList.txt b/test/ProblemList.txt
index 7c83f52f75c087c3436a05aa24fdc30b8d32acb4..00662effb83329015e856ba3fae0c6126bc527a9 100644
--- a/test/ProblemList.txt
+++ b/test/ProblemList.txt
@@ -41,11 +41,11 @@
 #
 # List items  are testnames followed by labels, all MUST BE commented
 #   as to why they are here and use a label:
-#     generic-all       Problems on all platforms
-#     generic-ARCH      Where ARCH is one of: sparc, sparcv9, x64, i586, etc.
-#     OSNAME-all        Where OSNAME is one of: solaris, linux, windows, macosx
-#     OSNAME-ARCH       Specific on to one OSNAME and ARCH, e.g. solaris-amd64
-#     OSNAME-REV        Specific on to one OSNAME and REV, e.g. solaris-5.8
+#     generic-all   Problems on all platforms
+#     generic-ARCH  Where ARCH is one of: sparc, sparcv9, x64, i586, etc.
+#     OSNAME-all    Where OSNAME is one of: solaris, linux, windows, macosx, aix
+#     OSNAME-ARCH   Specific on to one OSNAME and ARCH, e.g. solaris-amd64
+#     OSNAME-REV    Specific on to one OSNAME and REV, e.g. solaris-5.8
 #
 # More than one label is allowed but must be on the same line.
 #
@@ -134,6 +134,11 @@ sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh	windows-all
 
 # jdk_jmx
 
+# 8030957
+com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java aix-all
+com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java  aix-all
+javax/management/MBeanServer/OldMBeanServerTest.java            aix-all
+
 ############################################################################
 
 # jdk_math
diff --git a/test/com/sun/corba/5036554/TestCorbaBug.sh b/test/com/sun/corba/5036554/TestCorbaBug.sh
index 983608cb5609868d4eee9923564e907186c69378..7e057e72c387d9eb270ccc2797cd7f8c13a9425b 100644
--- a/test/com/sun/corba/5036554/TestCorbaBug.sh
+++ b/test/com/sun/corba/5036554/TestCorbaBug.sh
@@ -48,7 +48,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/com/sun/corba/cachedSocket/7056731.sh b/test/com/sun/corba/cachedSocket/7056731.sh
index 5244b9a70a53347cdf66c79d361cf8552a784fcc..3b58ad6e632e2fbfc677827320b1cc4d4930e0ec 100644
--- a/test/com/sun/corba/cachedSocket/7056731.sh
+++ b/test/com/sun/corba/cachedSocket/7056731.sh
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java b/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java
index e616daadde4c586b7a7b1688de9576dec115e19a..35e55f091743fb38f19eb1e356499138e2123eca 100644
--- a/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java
+++ b/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java
@@ -25,7 +25,7 @@
  * @bug 8016551
  * @summary JMenuItem in WindowsLookAndFeel can't paint default icons
  * @author Leonid Romanov
- * @run main bug8016551
+ * @run main/othervm bug8016551
  */
 
 import javax.swing.*;
diff --git a/test/com/sun/jdi/ImmutableResourceTest.sh b/test/com/sun/jdi/ImmutableResourceTest.sh
index fa312adad747425fe24a8b0d03c88e0f032ab431..29c72ed6254f19e4388a5ac8c005781badcc375b 100644
--- a/test/com/sun/jdi/ImmutableResourceTest.sh
+++ b/test/com/sun/jdi/ImmutableResourceTest.sh
@@ -56,7 +56,7 @@ pass()
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | Darwin )
+   SunOS | Linux | Darwin | AIX )
       PATHSEP=":"
       ;;
 
diff --git a/test/com/sun/jdi/JITDebug.sh b/test/com/sun/jdi/JITDebug.sh
index 0ec359799a688ca99bf882eb5c9f616a55cc4802..c647e1153b5e47d79e5ae45580870c2c44cb4265 100644
--- a/test/com/sun/jdi/JITDebug.sh
+++ b/test/com/sun/jdi/JITDebug.sh
@@ -63,7 +63,7 @@ pass()
 OS=`uname -s`
 export TRANSPORT_METHOD
 case "$OS" in
-   SunOS | Linux | Darwin )
+   SunOS | Linux | Darwin | AIX )
       PATHSEP=":"
       TRANSPORT_METHOD=dt_socket
       ;;
diff --git a/test/com/sun/jdi/PrivateTransportTest.sh b/test/com/sun/jdi/PrivateTransportTest.sh
index 32677db795b73c2cf0c3a920917625ac8146365f..ee8051f46ee9e0dd823338bcd1c1384d5c31c73f 100644
--- a/test/com/sun/jdi/PrivateTransportTest.sh
+++ b/test/com/sun/jdi/PrivateTransportTest.sh
@@ -102,7 +102,7 @@ libdir=${TESTCLASSES}
 is_windows=false
 is_cygwin=false
 case `uname -s` in 
-  SunOS|Linux)
+  SunOS|Linux|AIX)
     xx=`find ${jreloc}/lib -name libdt_socket.so`
     libloc=`dirname ${xx}`
     ;;
@@ -161,13 +161,23 @@ elif [ -f ${libloc}/libdt_socket.so ] ; then
     echo cp ${libloc}/libdt_socket.so ${fullpath}
     cp ${libloc}/libdt_socket.so ${fullpath}
     # make sure we can find libraries in current directory
-    if [ "${LD_LIBRARY_PATH}" = "" ] ; then
-        LD_LIBRARY_PATH=${libdir}
+    if [ "$os" = "AIX" ] ; then
+        if [ "${LIBPATH}" = "" ] ; then
+            LIBPATH=${libdir}
+        else
+            LIBPATH=${LIBPATH}:${libdir}
+        fi
+        export LIBPATH
+        echo LIBPATH=${LIBPATH}
     else
-        LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${libdir}
+        if [ "${LD_LIBRARY_PATH}" = "" ] ; then
+            LD_LIBRARY_PATH=${libdir}
+        else
+            LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${libdir}
+        fi
+        export LD_LIBRARY_PATH
+        echo LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
     fi
-    export LD_LIBRARY_PATH
-    echo LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 else 
     echo "cannot find dt_socket in ${libloc} for ${private_transport}"
     fail "cannot find dt_socket in ${libloc} for ${private_transport}"
diff --git a/test/com/sun/jdi/ShellScaffold.sh b/test/com/sun/jdi/ShellScaffold.sh
index 6ed55c1ae911604e38e5862593aea7909551d2f0..7bc063d44ebebf031edf3adf967b989f36644d7f 100644
--- a/test/com/sun/jdi/ShellScaffold.sh
+++ b/test/com/sun/jdi/ShellScaffold.sh
@@ -199,6 +199,8 @@ findPid()
         if [ "$osname" = SunOS ] ; then
             # Solaris and OpenSolaris use pgrep and not ps in psCmd
             findPidCmd="$psCmd"
+        elif [ "$osname" = AIX ] ; then
+            findPidCmd="$psCmd"
         else
             #   Never use plain 'ps', which requires a "controlling terminal"
             #     and will fail  with a "ps: no controlling terminal" error.
@@ -293,7 +295,7 @@ EOF
          psCmd=ps
          jstack=jstack.exe
          ;;
-       SunOS | Linux | Darwin)
+       SunOS | Linux | Darwin | AIX)
          transport=dt_socket
          address=
          devnull=/dev/null
diff --git a/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh b/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
index 6222c80bd14889841e8302ff4128649fa7f85992..2b104822b17930bc7d95f7aa8f5c0c1f03d97c23 100644
--- a/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
+++ b/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
@@ -45,7 +45,7 @@ fi
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     ;;
   Windows* | CYGWIN*)
diff --git a/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh b/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh
index 148041c2825b7a28b35b1a6fce5149668feb6ba2..f772c25245f3c9c24746c4e7753f597093aef3df 100644
--- a/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh
+++ b/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh
@@ -102,6 +102,14 @@ case "$OS" in
       TMP=`cd "${SystemRoot}/Temp"; echo ${PWD}`
       ;;
 
+   AIX )
+      VAR="A different value for AIX"
+      DEFAULT_JDK=/
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
    # catch all other OSs
    * )
       echo "Unrecognized system!  $OS"
diff --git a/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh b/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
index ccbea0c7ed06f0da06dd114f2ffc4a68443eb55a..d888039257021dccfde9501cc548d16e3dc5a68c 100644
--- a/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
+++ b/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh
@@ -135,6 +135,14 @@ case "$OS" in
       TMP=`cd "${SystemRoot}/Temp"; echo ${PWD}`
       ;;
 
+    AIX )
+      VAR="A different value for AIX"
+      DEFAULT_JDK=/
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
    # catch all other OSs
    * )
       echo "Unrecognized system!  $OS"
diff --git a/test/java/io/Serializable/evolution/RenamePackage/run.sh b/test/java/io/Serializable/evolution/RenamePackage/run.sh
index deda2826115478fd2ffcf1ca99291f1de19e1a6e..f37159d689951dfd27377bcf1ba288f5a3c69f22 100644
--- a/test/java/io/Serializable/evolution/RenamePackage/run.sh
+++ b/test/java/io/Serializable/evolution/RenamePackage/run.sh
@@ -45,7 +45,7 @@ OS=`uname -s`
 # Need to determine the classpath separator and filepath separator based on the
 # operating system.
 case "$OS" in
-SunOS | Linux | Darwin )
+SunOS | Linux | Darwin | AIX )
   PS=":"  ;;
 Windows* | CYGWIN* )
   PS=";"  ;;
diff --git a/test/java/io/Serializable/serialver/classpath/run.sh b/test/java/io/Serializable/serialver/classpath/run.sh
index 8c6b9f3d0be3f53bcf0f7584e7f290b9aa63b3f0..2aa1b0e92eaaaf24695d11fa8c35a95fc39c76d8 100644
--- a/test/java/io/Serializable/serialver/classpath/run.sh
+++ b/test/java/io/Serializable/serialver/classpath/run.sh
@@ -47,7 +47,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"    ;;
   Windows* | CYGWIN* )
     PS=";"    ;;
diff --git a/test/java/io/Serializable/serialver/nested/run.sh b/test/java/io/Serializable/serialver/nested/run.sh
index 765d2d41c413c86b5cd5ea2a78a177bc36b156eb..578e74afc51ea1b5a07699ba21c03a896d60cb35 100644
--- a/test/java/io/Serializable/serialver/nested/run.sh
+++ b/test/java/io/Serializable/serialver/nested/run.sh
@@ -47,7 +47,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"    ;;
   Windows* | CYGWIN* )
     PS=";"    ;;
diff --git a/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh b/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
index 24b129aecbc1d4faf302cc169ded649686065327..c86a4c00f73c003438a60332ec2a2b4ac05f643f 100644
--- a/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
+++ b/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
@@ -58,6 +58,9 @@ case "$OS" in
   Darwin )
     FS="/"
     ;;
+  AIX )
+    FS="/"
+    ;;
   Windows*)
     FS="\\"
     ;;
diff --git a/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh b/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
index 6d5aabb0728d69c3cc36fb9a2fcb026dca278f31..49abefef8b4868e1db4007d160ae0da2db60f007 100644
--- a/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
+++ b/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
@@ -63,6 +63,9 @@ case "$OS" in
   Darwin )
     FS="/"
     ;;
+  AIX )
+    FS="/"
+    ;;
   Windows* | CYGWIN* )
     FS="\\"
     ;;
diff --git a/test/java/lang/StringCoding/CheckEncodings.sh b/test/java/lang/StringCoding/CheckEncodings.sh
index edc5f9a4e4988650903bf4b97135a9b8b50189bc..2936d9cae654414c208448bba121527449a893ae 100644
--- a/test/java/lang/StringCoding/CheckEncodings.sh
+++ b/test/java/lang/StringCoding/CheckEncodings.sh
@@ -30,7 +30,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin) ;;
+  SunOS | Linux | Darwin | AIX ) ;;
   Windows* | CYGWIN* )
     echo "Passed"; exit 0 ;;
   * ) echo "Unrecognized system!" ;  exit 1 ;;
diff --git a/test/java/lang/annotation/loaderLeak/LoaderLeak.sh b/test/java/lang/annotation/loaderLeak/LoaderLeak.sh
index e62a63cd8a56bbd1bec49a68237b34c040c5d3d6..915aa9558ffd1e0752efadba0dae8afebc813489 100644
--- a/test/java/lang/annotation/loaderLeak/LoaderLeak.sh
+++ b/test/java/lang/annotation/loaderLeak/LoaderLeak.sh
@@ -48,7 +48,7 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin)
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh b/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
index 3455959c3aa26f711dcb9892492f43442ed2dae9..c47f59de8341cd2345e8e76929a6dba2de10a822 100644
--- a/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
+++ b/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
@@ -47,6 +47,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  AIX )
+    PS=":"
+    FS="/"
+    ;;
   Windows*)
     PS=";"
     OS="Windows"
diff --git a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh
index 571a3d931a38d6d14a374cab767f4b39fc22f409..1ef2f35c8e9ad7f7873ce27d4df5c025498674e5 100644
--- a/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh
+++ b/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh
@@ -61,7 +61,7 @@ i=1
 while true; do
   echo "Run $i: TestSystemLoadAvg"
   case `uname -s` in
-       SunOS | Linux | Darwin )
+       SunOS | Linux | Darwin | AIX )
          runOne GetSystemLoadAverage
          ;;
       * )
diff --git a/test/java/net/Authenticator/B4933582.sh b/test/java/net/Authenticator/B4933582.sh
index fa1768398aee154d9f31f27a25aa087007956dab..1e1268e3f8a4c3264dbc4f909bfb8fb534a4d6bd 100644
--- a/test/java/net/Authenticator/B4933582.sh
+++ b/test/java/net/Authenticator/B4933582.sh
@@ -26,7 +26,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/net/DatagramSocket/Send12k.java b/test/java/net/DatagramSocket/Send12k.java
index 6446330d35eca3c3e48a804a93f4ed91fb753d7c..f6375c1f0b7910513b5ba43e28196ab3a0ba1a39 100644
--- a/test/java/net/DatagramSocket/Send12k.java
+++ b/test/java/net/DatagramSocket/Send12k.java
@@ -53,7 +53,7 @@ public class Send12k {
         boolean sendOkay = true;
         try {
             s1.send(p1);
-        } catch (SocketException e) {
+        } catch (IOException e) {
             /*
              * Prior to merlin a send of > 12k to loopback address
              * would fail silently.
diff --git a/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh b/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
index 271b21d26f33915a2a59568b2b2ae18a1c88b93a..eac0315e7e364bd339beada4f8f033fd782be881 100644
--- a/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
+++ b/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
@@ -27,7 +27,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Darwin )
+  SunOS | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     ;;
diff --git a/test/java/net/Socket/OldSocketImpl.sh b/test/java/net/Socket/OldSocketImpl.sh
index bbe055fa2eadc8c603e6787a9d00a304822bdeb4..70b92afc7b6ac785b9e17be6ac557d9a5f689bb1 100644
--- a/test/java/net/Socket/OldSocketImpl.sh
+++ b/test/java/net/Socket/OldSocketImpl.sh
@@ -28,7 +28,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/net/URL/B5086147.sh b/test/java/net/URL/B5086147.sh
index a669e1347ee1f9de1fd2111ba8149912501eece3..772d7a32cd14c529c9620250c2aede30579cda36 100644
--- a/test/java/net/URL/B5086147.sh
+++ b/test/java/net/URL/B5086147.sh
@@ -26,7 +26,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     exit 0
     ;;
   CYGWIN* )
diff --git a/test/java/net/URLClassLoader/B5077773.sh b/test/java/net/URLClassLoader/B5077773.sh
index 9bd9a1e6f34a78ffade747e063692916d01afc23..3b52698840a80ef4e9d2545eae493a43314c240a 100644
--- a/test/java/net/URLClassLoader/B5077773.sh
+++ b/test/java/net/URLClassLoader/B5077773.sh
@@ -34,7 +34,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Darwin )
+  SunOS | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/net/URLClassLoader/sealing/checksealed.sh b/test/java/net/URLClassLoader/sealing/checksealed.sh
index 0d212c62aae8563924dead634797d7df4e192586..339525a1042de26e4a5c52b7e60f8ba5e21af950 100644
--- a/test/java/net/URLClassLoader/sealing/checksealed.sh
+++ b/test/java/net/URLClassLoader/sealing/checksealed.sh
@@ -27,7 +27,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Darwin )
+  SunOS | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/net/URLConnection/6212146/test.sh b/test/java/net/URLConnection/6212146/test.sh
index 45f5310005ec0d091d62d13a0cda66ed1a1c38bb..9a0615cadf33d194bfd2ed2e739f9595ce6a0b23 100644
--- a/test/java/net/URLConnection/6212146/test.sh
+++ b/test/java/net/URLConnection/6212146/test.sh
@@ -33,7 +33,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Darwin )
+  SunOS | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/nio/charset/coders/CheckSJISMappingProp.sh b/test/java/nio/charset/coders/CheckSJISMappingProp.sh
index fd76d5a5031d3df6f40ad7c4659c6566f10c3a8d..5c14e7392ecd1c2b2584690ff986b84dff5baded 100644
--- a/test/java/nio/charset/coders/CheckSJISMappingProp.sh
+++ b/test/java/nio/charset/coders/CheckSJISMappingProp.sh
@@ -34,7 +34,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin ) ;;
+  SunOS | Linux | Darwin | AIX ) ;;
   # Skip locale test for Windows
   Windows* | CYGWIN* )
     echo "Passed"; exit 0 ;;
diff --git a/test/java/nio/charset/spi/basic.sh b/test/java/nio/charset/spi/basic.sh
index 6b5ad3108ac890ede9bb31caa2032075d75595f7..6bc60d140e778ad43584d136bcdcef3fb508dbde 100644
--- a/test/java/nio/charset/spi/basic.sh
+++ b/test/java/nio/charset/spi/basic.sh
@@ -48,7 +48,7 @@ JAR=$COMPILEJAVA/bin/jar
 
 DIR=`pwd`
 case `uname` in
-  SunOS | Linux | Darwin ) CPS=':' ;;
+  SunOS | Linux | Darwin | AIX ) CPS=':' ;;
   Windows* )      CPS=';' ;;
   CYGWIN*  )
     DIR=`/usr/bin/cygpath -a -s -m $DIR`
@@ -81,7 +81,7 @@ if [ $# -gt 0 ]; then
     L="$1"
     shift
     s=`uname -s`
-    if [ $s != Linux -a $s != SunOS -a $s != Darwin ]; then
+    if [ $s != Linux -a $s != SunOS -a $s != Darwin -a $s != AIX ]; then
       echo "$L: Locales not supported on this system, skipping..."
       exit 0
     fi
diff --git a/test/java/nio/file/Files/SBC.java b/test/java/nio/file/Files/SBC.java
index ab467266edfe25d2c23bc05c7b1d3e4499822bff..d26428d5f60731f123500d8e785518062284edae 100644
--- a/test/java/nio/file/Files/SBC.java
+++ b/test/java/nio/file/Files/SBC.java
@@ -235,7 +235,7 @@ public class SBC {
             try {
                 Files.newByteChannel(link, READ, LinkOption.NOFOLLOW_LINKS);
                 throw new RuntimeException();
-            } catch (IOException x) {
+            } catch (IOException | UnsupportedOperationException x) {
             } finally {
                 TestUtil.deleteUnchecked(link);
             }
diff --git a/test/java/nio/file/Files/walkFileTree/find.sh b/test/java/nio/file/Files/walkFileTree/find.sh
index 9a99147fda079b946eb6e942916ee3d0d56adea2..2549ad3cbbb347af18b537d2f5f5b8bb33dfc614 100644
--- a/test/java/nio/file/Files/walkFileTree/find.sh
+++ b/test/java/nio/file/Files/walkFileTree/find.sh
@@ -43,7 +43,14 @@ case "$OS" in
         echo "This test does not run on Windows" 
         exit 0
         ;;
+    AIX )
+        CLASSPATH=${TESTCLASSES}:${TESTSRC}
+        # On AIX "find -follow" may core dump on recursive links without '-L'
+        # see: http://www-01.ibm.com/support/docview.wss?uid=isg1IV28143
+        FIND_FOLLOW_OPT="-L"
+        ;;
     * )
+        FIND_FOLLOW_OPT=
         CLASSPATH=${TESTCLASSES}:${TESTSRC}
         ;;
 esac
@@ -65,7 +72,7 @@ if [ $? != 0 ]; then failures=`expr $failures + 1`; fi
 # cycles (sym links to ancestor directories), other versions do
 # not. For that reason we run PrintFileTree with the -printCycles
 # option when the output without this option differs to find(1).
-find "$ROOT" -follow > out1
+find $FIND_FOLLOW_OPT "$ROOT" -follow > out1
 $JAVA ${TESTVMOPTS} PrintFileTree -follow "$ROOT" > out2
 diff out1 out2
 if [ $? != 0 ];
diff --git a/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh b/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh
index 9c7a2eac4ecdfdd59f8473aeb0deba5eeb23bdad..86dfff43f5b046b95591782b1e06f2435a36bb6e 100644
--- a/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh
+++ b/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh
@@ -33,7 +33,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     ;;
   Windows* | CYGWIN* )
diff --git a/test/java/rmi/registry/readTest/readTest.sh b/test/java/rmi/registry/readTest/readTest.sh
index bb37f65b4cca312717b4e68b2389237877abe045..c6abad2db78bf215c6d67e062c25ca50e762cce0 100644
--- a/test/java/rmi/registry/readTest/readTest.sh
+++ b/test/java/rmi/registry/readTest/readTest.sh
@@ -30,7 +30,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     FILEURL="file:"
diff --git a/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh b/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
index 7f5dc78c23a3a7dc1e6656176b2666141f5452ac..3794cd41bbbcecd97106721779d4482731f6f5b5 100644
--- a/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
+++ b/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
@@ -62,6 +62,10 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
diff --git a/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh b/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
index e1ed14425fa5c4c0e6008cfa935e5f1551b1317f..f2002448566feaf80f7dfafb21bbb897fe979ea3 100644
--- a/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
+++ b/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
@@ -46,6 +46,10 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
diff --git a/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh b/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
index e817db37898db9ae9c576af3d579849b240e218a..2951a28e54953c0445ab5267a5e248828b736d7a 100644
--- a/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
+++ b/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
@@ -70,6 +70,10 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   Windows* )
     PATHSEP=";"
     FILESEP="\\"
diff --git a/test/java/security/Security/signedfirst/Dyn.sh b/test/java/security/Security/signedfirst/Dyn.sh
index 73cff3e80da8f10553a4569d6649d26b82091271..019a2f46c60dfd05f9ae2d55b2816402cbb8a254 100644
--- a/test/java/security/Security/signedfirst/Dyn.sh
+++ b/test/java/security/Security/signedfirst/Dyn.sh
@@ -62,6 +62,10 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
diff --git a/test/java/security/Security/signedfirst/Static.sh b/test/java/security/Security/signedfirst/Static.sh
index 46765e4a92b58cee1ce1f3d0365c0af26840ecbf..b22ca05e184ec98b9866a116eb155d04b45d2de0 100644
--- a/test/java/security/Security/signedfirst/Static.sh
+++ b/test/java/security/Security/signedfirst/Static.sh
@@ -62,6 +62,10 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
diff --git a/test/java/util/Currency/PropertiesTest.sh b/test/java/util/Currency/PropertiesTest.sh
index 65ab89da2e0ef44cd1540ae2ec49c1256c49d05f..01f1326cd2d474ab0a6ebc9c095865b684aab28b 100644
--- a/test/java/util/Currency/PropertiesTest.sh
+++ b/test/java/util/Currency/PropertiesTest.sh
@@ -52,7 +52,7 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/util/Locale/LocaleCategory.sh b/test/java/util/Locale/LocaleCategory.sh
index 7715d3542258009f7866fab0b2fa50e1f78389ef..989556a2477e1affb60f76768558b3222aaff124 100644
--- a/test/java/util/Locale/LocaleCategory.sh
+++ b/test/java/util/Locale/LocaleCategory.sh
@@ -52,7 +52,7 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin )
+  SunOS | Linux | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/util/Locale/LocaleProviders.sh b/test/java/util/Locale/LocaleProviders.sh
index db6e4a92d62fbd851ca1eebd5d2bbac45c9882e6..58cd9c82060dfeb78879f4c9adb0ac3ec968fe1e 100644
--- a/test/java/util/Locale/LocaleProviders.sh
+++ b/test/java/util/Locale/LocaleProviders.sh
@@ -56,7 +56,7 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | *BSD | Darwin )
+  SunOS | Linux | *BSD | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/util/PluggableLocale/ExecTest.sh b/test/java/util/PluggableLocale/ExecTest.sh
index 3aa001c86ca197893d225f84ef7ee085cef98dd8..a30d70312d26d96b22c88d9ca3f1d2c5dd33cbde 100644
--- a/test/java/util/PluggableLocale/ExecTest.sh
+++ b/test/java/util/PluggableLocale/ExecTest.sh
@@ -62,7 +62,7 @@ echo "CLASSPATH=${CLASSPATH}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/java/util/ResourceBundle/Bug6299235Test.sh b/test/java/util/ResourceBundle/Bug6299235Test.sh
index d348d495d504f25803891d501286ac3c4175f9c4..d0eb2a2f609e9da1cc8b35a0cd94c601b88db45b 100644
--- a/test/java/util/ResourceBundle/Bug6299235Test.sh
+++ b/test/java/util/ResourceBundle/Bug6299235Test.sh
@@ -31,7 +31,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     ;;
diff --git a/test/java/util/ServiceLoader/basic.sh b/test/java/util/ServiceLoader/basic.sh
index 5d8846a02d8f63dac1455b40515fa3564f980de1..2c1cd6f6418233dcd4f262604c9f94c34017f16e 100644
--- a/test/java/util/ServiceLoader/basic.sh
+++ b/test/java/util/ServiceLoader/basic.sh
@@ -43,7 +43,7 @@ JAR="$COMPILEJAVA/bin/jar"
 
 OS=`uname -s`
 case "$OS" in
-    SunOS | Darwin )
+    SunOS | Darwin | AIX )
       SEP=':' ;;
     Linux )
       SEP=':' ;;
diff --git a/test/java/util/logging/AnonLoggerWeakRefLeak.sh b/test/java/util/logging/AnonLoggerWeakRefLeak.sh
index eef8641c7b665ec554f0d31ba948427b9a8e118e..fc1aece9ebdcd55b2b6deb54018d1d25f6ece93a 100644
--- a/test/java/util/logging/AnonLoggerWeakRefLeak.sh
+++ b/test/java/util/logging/AnonLoggerWeakRefLeak.sh
@@ -83,9 +83,9 @@ if [ "$status" != 0 ]; then
     fi
 
     if [ "$status" != 0 ]; then
-        echo "ERROR: 'jmap $jmap_option' is not supported so this test"
-        echo "ERROR: cannot work reliably. Aborting!"
-        exit 2
+        echo "WARNING: 'jmap $jmap_option' is not supported on this platform"
+        echo "WARNING: so this test cannot work reliably. Aborting!"
+        exit 0
     fi
 fi
 
diff --git a/test/java/util/logging/LoggerWeakRefLeak.sh b/test/java/util/logging/LoggerWeakRefLeak.sh
index ea3dc1f8f1dd993d65bdc6912ccfa5f7bf0df5ac..25cc4aabc743aee7a615f8e0ed688e369152733a 100644
--- a/test/java/util/logging/LoggerWeakRefLeak.sh
+++ b/test/java/util/logging/LoggerWeakRefLeak.sh
@@ -83,9 +83,9 @@ if [ "$status" != 0 ]; then
     fi
 
     if [ "$status" != 0 ]; then
-        echo "ERROR: 'jmap $jmap_option' is not supported so this test"
-        echo "ERROR: cannot work reliably. Aborting!"
-        exit 2
+        echo "WARNING: 'jmap $jmap_option' is not supported on this platform"
+        echo "WARNING: so this test cannot work reliably. Aborting!"
+        exit 0
     fi
 fi
 
diff --git a/test/java/util/prefs/CheckUserPrefsStorage.sh b/test/java/util/prefs/CheckUserPrefsStorage.sh
index 28210696b3935d8ffdf69975e8e8f784841fc31a..bfb4a2a54c75267b8ffefbf6c6614d9d5daafd37 100644
--- a/test/java/util/prefs/CheckUserPrefsStorage.sh
+++ b/test/java/util/prefs/CheckUserPrefsStorage.sh
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/javax/crypto/SecretKeyFactory/FailOverTest.sh b/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
index c16b60ff877ddd7c1409e608e4b9c86ed4a9f12d..51eaa6eda0cd776de5feb600e8def291498a1854 100644
--- a/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
+++ b/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
@@ -56,7 +56,7 @@ echo "TESTCLASSES=${TESTCLASSES}"
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh b/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh
index 84a58535cf115c00ba88b5162f424c08a9046620..800a898eb1acde27b9c3fd629f1c9727f91b0fb2 100644
--- a/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh
+++ b/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatTest.sh
@@ -89,7 +89,7 @@ case "$OS" in
       FILESEP="/"
       ;;
 
-   Linux | Darwin  )
+   Linux | Darwin | AIX )
       VAR="A different value for Linux"
       DEFAULT_JDK=/none
       #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386
diff --git a/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh b/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh
index ed36fef3f17cdc4cf4592c19f0d2b0a641a17feb..eb60ba992821e81afe94f2a91ace4a64d8943fe4 100644
--- a/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh
+++ b/test/javax/imageio/metadata/IIOMetadataFormat/runMetadataFormatThreadTest.sh
@@ -90,7 +90,7 @@ case "$OS" in
       FILESEP="/"
       ;;
 
-   Linux | Darwin )
+   Linux | Darwin | AIX )
       VAR="A different value for Linux"
       DEFAULT_JDK=/none
       #DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386
diff --git a/test/javax/imageio/stream/StreamCloserLeak/run_test.sh b/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
index 18ffc1c8d40245bd7c577a27cc9dba97345837e4..1977ca80275a2a5c593e6643175fba20880cc69a 100644
--- a/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
+++ b/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
@@ -92,6 +92,14 @@ case "$OS" in
       TMP="/tmp"
       ;;
 
+   AIX )
+      VAR="A different value for AIX"
+      DEFAULT_JDK=/
+      FILESEP="/"
+      PATHSEP=":"
+      TMP="/tmp"
+      ;;
+
    Darwin )
       VAR="A different value for MacOSX"
       DEFAULT_JDK=/usr
diff --git a/test/javax/script/CommonSetup.sh b/test/javax/script/CommonSetup.sh
index 69ed2379edaca7fff0048c2c0f9dd1e8b3fab939..7a64bd8c6611a11c6619c25fbeb4f46d9d93ebb6 100644
--- a/test/javax/script/CommonSetup.sh
+++ b/test/javax/script/CommonSetup.sh
@@ -36,7 +36,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/javax/security/auth/Subject/doAs/Test.sh b/test/javax/security/auth/Subject/doAs/Test.sh
index 73565211859ea2405370754e0abdde74114ffd17..fac17d138c59549cf56d71df9d70ffe80b25d876 100644
--- a/test/javax/security/auth/Subject/doAs/Test.sh
+++ b/test/javax/security/auth/Subject/doAs/Test.sh
@@ -48,6 +48,11 @@ case "$OS" in
     FS="/"
     RM="/bin/rm -f"
     ;;
+  AIX )
+    PS=":"
+    FS="/"
+    RM="/bin/rm -f"
+    ;;
   CYGWIN* )
     PS=";"
     FS="/"
diff --git a/test/lib/security/java.policy/Ext_AllPolicy.sh b/test/lib/security/java.policy/Ext_AllPolicy.sh
index b562afa4323f37909374b5a062708dd363608ca4..fff2a3436fcecd8b347dccc0cd5f30886f08478d 100644
--- a/test/lib/security/java.policy/Ext_AllPolicy.sh
+++ b/test/lib/security/java.policy/Ext_AllPolicy.sh
@@ -53,7 +53,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh b/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
index 570631dc11e5ddb6e1165007de2ebebf5cf91623..aab8bbd9e88a17f06594b584ef3eb448229a852d 100644
--- a/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
+++ b/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
@@ -42,7 +42,7 @@ if [[ $OS == CYGWIN_NT* ]] ; then
 fi
 
 case $OS in
-SunOS | Linux | Darwin)
+SunOS | Linux | Darwin | AIX )
     PATHSEP=":"
     FILESEP="/"
     DFILESEP=$FILESEP
diff --git a/test/sun/net/ftp/MarkResetTest.sh b/test/sun/net/ftp/MarkResetTest.sh
index c998bcffef2ab4d8d26cde3d8d6d8aaa3671d54a..3878b505d90a3370ea06114391f2451e9b99cccd 100644
--- a/test/sun/net/ftp/MarkResetTest.sh
+++ b/test/sun/net/ftp/MarkResetTest.sh
@@ -28,7 +28,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/net/www/http/HttpClient/RetryPost.sh b/test/sun/net/www/http/HttpClient/RetryPost.sh
index 17d08cd30b049299ab14baaa127d7fad22561c59..c500171220cf8339bf2294d9c35d49aba37d2973 100644
--- a/test/sun/net/www/http/HttpClient/RetryPost.sh
+++ b/test/sun/net/www/http/HttpClient/RetryPost.sh
@@ -28,7 +28,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/net/www/protocol/jar/B5105410.sh b/test/sun/net/www/protocol/jar/B5105410.sh
index f47ca5ed99de5a301eda21403ccd2993b506b1ef..aa31a53ebc2d0110631cd67f3db65e66bd9f9ed9 100644
--- a/test/sun/net/www/protocol/jar/B5105410.sh
+++ b/test/sun/net/www/protocol/jar/B5105410.sh
@@ -31,7 +31,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/net/www/protocol/jar/jarbug/run.sh b/test/sun/net/www/protocol/jar/jarbug/run.sh
index 5f039b97c93e4a6eb77690cd096bf04ccb2b05b5..69632014bacb20d429e70d876ed6fd481bd3fb31 100644
--- a/test/sun/net/www/protocol/jar/jarbug/run.sh
+++ b/test/sun/net/www/protocol/jar/jarbug/run.sh
@@ -31,7 +31,7 @@ DEST=`pwd`
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/rmi/rmic/newrmic/equivalence/batch.sh b/test/sun/rmi/rmic/newrmic/equivalence/batch.sh
index 020202a181876b18ead4d00891dd3fa916d84a64..25913c63ea0768928cf0a083df6892af4e0c292d 100644
--- a/test/sun/rmi/rmic/newrmic/equivalence/batch.sh
+++ b/test/sun/rmi/rmic/newrmic/equivalence/batch.sh
@@ -61,13 +61,13 @@ mkdir $newv11dir $newvcompatdir $newv12dir
 
 set -ex
 
-${TESTJAVA}/bin/rmic -keep -nowrite -v1.1 -d $refv11dir -classpath "$@"
-${TESTJAVA}/bin/rmic -keep -nowrite -vcompat -d $refvcompatdir -classpath "$@"
-${TESTJAVA}/bin/rmic -keep -v1.2 -d $refv12dir -classpath "$@"
+${TESTJAVA}/bin/rmic       -keep -nowrite -v1.1 -d $refv11dir -classpath "$@"
+${TESTJAVA}/bin/rmic       -keep -nowrite -vcompat -d $refvcompatdir -classpath "$@"
+${TESTJAVA}/bin/rmic       -keep -nowrite -v1.2 -d $refv12dir -classpath "$@"
 
-${TESTJAVA}/bin/rmic -Xnew -nowrite -keep -v1.1 -d $newv11dir -classpath "$@"
-${TESTJAVA}/bin/rmic -Xnew -nowrite -keep -vcompat -d $newvcompatdir -classpath "$@"
-${TESTJAVA}/bin/rmic -Xnew -keep -v1.2 -d $newv12dir -classpath "$@"
+${TESTJAVA}/bin/rmic -Xnew -keep -nowrite -v1.1 -d $newv11dir -classpath "$@"
+${TESTJAVA}/bin/rmic -Xnew -keep -nowrite -vcompat -d $newvcompatdir -classpath "$@"
+${TESTJAVA}/bin/rmic -Xnew -keep -nowrite -v1.2 -d $newv12dir -classpath "$@"
 
 set +ex
 
diff --git a/test/sun/security/krb5/runNameEquals.sh b/test/sun/security/krb5/runNameEquals.sh
index 7ee81e505c61fd713336a7ff8b0e7cabe21a3db9..f65e32ffd9754de2e2fbc29f4168938351d7a324 100644
--- a/test/sun/security/krb5/runNameEquals.sh
+++ b/test/sun/security/krb5/runNameEquals.sh
@@ -66,6 +66,10 @@ case "$OS" in
         fi
     fi
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
diff --git a/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh b/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
index 30b245c81a05d9b579129ebe71c1968893e02057..7e93e184354d4cb25f7b9f40e5cee36ecbe6c871 100644
--- a/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
+++ b/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
@@ -72,6 +72,12 @@ case "$OS" in
     CP="${FS}bin${FS}cp"
     CHMOD="${FS}bin${FS}chmod"
     ;;
+  AIX )
+    FS="/"
+    PS=":"
+    CP="${FS}bin${FS}cp"
+    CHMOD="${FS}bin${FS}chmod"
+    ;;
   Windows* )
     FS="\\"
     PS=";"
diff --git a/test/sun/security/pkcs11/Provider/Login.sh b/test/sun/security/pkcs11/Provider/Login.sh
index a1f6b132c9ee4268a039dc0d01bcb52e8b8d3891..35f9ed562eadbaabd7c4cc43989118590e878ae1 100644
--- a/test/sun/security/pkcs11/Provider/Login.sh
+++ b/test/sun/security/pkcs11/Provider/Login.sh
@@ -73,6 +73,12 @@ case "$OS" in
     CP="${FS}bin${FS}cp"
     CHMOD="${FS}bin${FS}chmod"
     ;;
+  AIX )
+    FS="/"
+    PS=":"
+    CP="${FS}bin${FS}cp"
+    CHMOD="${FS}bin${FS}chmod"
+    ;;
   Windows* )
     FS="\\"
     PS=";"
diff --git a/test/sun/security/provider/KeyStore/DKSTest.sh b/test/sun/security/provider/KeyStore/DKSTest.sh
index b789e41414011e91f9755f2359c75831fe8f4132..99c7617dfa5e159892f01fca2166565e5815248f 100644
--- a/test/sun/security/provider/KeyStore/DKSTest.sh
+++ b/test/sun/security/provider/KeyStore/DKSTest.sh
@@ -50,15 +50,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS )
-    PS=":"
-    FS="/"
-    ;;
-  Linux )
-    PS=":"
-    FS="/"
-    ;;
-  Darwin )
+  SunOS | Linux | Darwin | AIX)
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh b/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
index 5775eab80b1db73ce521cd7c7fe0e92a945059f8..e2da96ea2971395f053b44777d0a46fe02c2f171 100644
--- a/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
+++ b/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
@@ -63,6 +63,10 @@ case "$OS" in
     PS=":"
     FS="/"
     ;;
+  AIX )
+    PS=":"
+    FS="/"
+    ;;
   CYGWIN* )
     PS=";"
     FS="/"
diff --git a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh
index 9b48bee7f3bd9f43db6284d106c46bf8fdc440a4..b0a824fc45e6848913dfae9483a1bd04b8b1a22c 100644
--- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh
+++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh
@@ -33,7 +33,7 @@
 
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
index eff4930de4a199637af5a58f9e2f926d68e117c5..ee2381612d03dc573c58b5db6fe504784898e498 100644
--- a/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
+++ b/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
@@ -46,7 +46,7 @@ fi
 
 OS=`uname -s`
 case "$OS" in
-    SunOS | Linux | Darwin )
+    SunOS | Linux | Darwin | AIX )
         FILESEP="/"
         PATHSEP=":"
         ;;
diff --git a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
index 4cdc5d4d1b7a801182ed00586996ae60bdc87b9b..1b7cf984e8b7eb5f814cd585764ada2054dddbb7 100644
--- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
+++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
@@ -32,7 +32,7 @@
 HOSTNAME=`uname -n`
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
index de7b039488c8d8a8656c5bc653196558980d15e1..fd24c76a475c000371ab7426955d28923d947c85 100644
--- a/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
+++ b/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
@@ -32,7 +32,7 @@
 HOSTNAME=`uname -n`
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     PS=":"
     FS="/"
     ;;
diff --git a/test/sun/security/tools/jarsigner/AlgOptions.sh b/test/sun/security/tools/jarsigner/AlgOptions.sh
index b6f8c8b3ff2937dbe94c628c240b934b6b270fd3..9b16831d799dcd209ff751f9fc96fde1a54245b4 100644
--- a/test/sun/security/tools/jarsigner/AlgOptions.sh
+++ b/test/sun/security/tools/jarsigner/AlgOptions.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/jarsigner/PercentSign.sh b/test/sun/security/tools/jarsigner/PercentSign.sh
index 559c0533e7352f2919524009a11107094d4fd57c..38d9ece9bbcdcf88b8a99098600da94fe430f89f 100644
--- a/test/sun/security/tools/jarsigner/PercentSign.sh
+++ b/test/sun/security/tools/jarsigner/PercentSign.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/jarsigner/diffend.sh b/test/sun/security/tools/jarsigner/diffend.sh
index 0f943796af4d67d85dd47bb9d67f1d0db5137cab..787b58680f3b6157b8589dbb44f7fb5528d0850f 100644
--- a/test/sun/security/tools/jarsigner/diffend.sh
+++ b/test/sun/security/tools/jarsigner/diffend.sh
@@ -41,7 +41,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/jarsigner/oldsig.sh b/test/sun/security/tools/jarsigner/oldsig.sh
index aae758cb937983b5c24323c0535d432e07061cab..062c2aa21d9ade6a909d1ebbce635d363b0ec960 100644
--- a/test/sun/security/tools/jarsigner/oldsig.sh
+++ b/test/sun/security/tools/jarsigner/oldsig.sh
@@ -42,7 +42,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/keytool/AltProviderPath.sh b/test/sun/security/tools/keytool/AltProviderPath.sh
index 82bc65787abde6e1f8af4fa90ecdda72c7bdf43b..8fd67ef0e0a3f9fcc0951aeb951740353c333bb1 100644
--- a/test/sun/security/tools/keytool/AltProviderPath.sh
+++ b/test/sun/security/tools/keytool/AltProviderPath.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/keytool/CloneKeyAskPassword.sh b/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
index 0f9b82c84b829e97ea4730c1fa09e657b9327d09..62d1195a1ca4287e27df77eeef864e3839ca5287 100644
--- a/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
+++ b/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
@@ -59,6 +59,10 @@ case "$OS" in
     PATHSEP=":"
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     PATHSEP=";"
     FILESEP="/"
diff --git a/test/sun/security/tools/keytool/NoExtNPE.sh b/test/sun/security/tools/keytool/NoExtNPE.sh
index da63ed8ce3ab41534ab3c2514825221a7724496a..99b6ae51f36d2d12bc7f39fec578220200684446 100644
--- a/test/sun/security/tools/keytool/NoExtNPE.sh
+++ b/test/sun/security/tools/keytool/NoExtNPE.sh
@@ -51,6 +51,10 @@ case "$OS" in
   Darwin )
     FILESEP="/"
     ;;
+  AIX )
+    PATHSEP=":"
+    FILESEP="/"
+    ;;
   CYGWIN* )
     FILESEP="/"
     ;;
diff --git a/test/sun/security/tools/keytool/SecretKeyKS.sh b/test/sun/security/tools/keytool/SecretKeyKS.sh
index 6246d2bdbb19bd70c4ae0a29d0b632ef42bd37b3..3323179daff592b7e464b5df4d6fbea3a8ffa1c6 100644
--- a/test/sun/security/tools/keytool/SecretKeyKS.sh
+++ b/test/sun/security/tools/keytool/SecretKeyKS.sh
@@ -45,7 +45,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/keytool/StandardAlgName.sh b/test/sun/security/tools/keytool/StandardAlgName.sh
index 8ac1324bc11547bbf2914f4e9ebb052add17936d..c12348537e102804de92b9b24788fad11e54c065 100644
--- a/test/sun/security/tools/keytool/StandardAlgName.sh
+++ b/test/sun/security/tools/keytool/StandardAlgName.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/keytool/StorePasswordsByShell.sh b/test/sun/security/tools/keytool/StorePasswordsByShell.sh
index 7347f345878fcfd66c2ffc3eebfe57b6fbbba57f..d3cd2ff92cb5ded820b84bc8e7a01c8dafda3aa8 100644
--- a/test/sun/security/tools/keytool/StorePasswordsByShell.sh
+++ b/test/sun/security/tools/keytool/StorePasswordsByShell.sh
@@ -46,15 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS )
-    PATHSEP=":"
-    FILESEP="/"
-    ;;
-  Linux )
-    PATHSEP=":"
-    FILESEP="/"
-    ;;
-  Darwin ) 
+  SunOS | Linux | Darwin | AIX)
     PATHSEP=":"
     FILESEP="/"
     ;;
diff --git a/test/sun/security/tools/keytool/printssl.sh b/test/sun/security/tools/keytool/printssl.sh
index 36ba9d0943740631e58776f64d11550de815ae5b..6ebdd3dad226b41f66690273aaf9a9dde48a699b 100644
--- a/test/sun/security/tools/keytool/printssl.sh
+++ b/test/sun/security/tools/keytool/printssl.sh
@@ -40,7 +40,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     FS="/"
     ;;
   CYGWIN* )
diff --git a/test/sun/security/tools/keytool/resource.sh b/test/sun/security/tools/keytool/resource.sh
index 1256422144e20b67cee1443ce21c665e6804e072..1e31ff2d2417a8945a1444eb393e2a4a236dcfd0 100644
--- a/test/sun/security/tools/keytool/resource.sh
+++ b/test/sun/security/tools/keytool/resource.sh
@@ -43,7 +43,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     FS="/"
     ;;
diff --git a/test/sun/security/tools/keytool/standard.sh b/test/sun/security/tools/keytool/standard.sh
index 630aa41c46fb282bb4542aeb8c564e254206f885..a42fbfda3ccc9954fe638d158b89d82fc60329d5 100644
--- a/test/sun/security/tools/keytool/standard.sh
+++ b/test/sun/security/tools/keytool/standard.sh
@@ -45,7 +45,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin | CYGWIN* )
+  SunOS | Linux | Darwin | AIX | CYGWIN* )
     FS="/"
     ;;
   Windows_* )
diff --git a/test/sun/security/tools/policytool/Alias.sh b/test/sun/security/tools/policytool/Alias.sh
index ae1e40820045ea9eea051feb4efbad9b990b5d91..c7c25899ce3e48b275139ae1b186153e9554b1ba 100644
--- a/test/sun/security/tools/policytool/Alias.sh
+++ b/test/sun/security/tools/policytool/Alias.sh
@@ -47,7 +47,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/policytool/ChangeUI.sh b/test/sun/security/tools/policytool/ChangeUI.sh
index 1b6a7984087b5e1b2ff88a25059a9c654150e523..96077fa6bebbcc2a5facf0b0b5b4e27bd1829c82 100644
--- a/test/sun/security/tools/policytool/ChangeUI.sh
+++ b/test/sun/security/tools/policytool/ChangeUI.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/policytool/OpenPolicy.sh b/test/sun/security/tools/policytool/OpenPolicy.sh
index 325b817c3d2850d6f0c09220b67b2b71f6bac3f9..ada838ebda99fed1e1f9fcf7890be74025235b50 100644
--- a/test/sun/security/tools/policytool/OpenPolicy.sh
+++ b/test/sun/security/tools/policytool/OpenPolicy.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/policytool/SaveAs.sh b/test/sun/security/tools/policytool/SaveAs.sh
index af18ad96c214b9dc45b4f7ec2b9c9b3774dfc5b8..1c16ecb426c3ad8ddf41826ebce51bc1a1c0e057 100644
--- a/test/sun/security/tools/policytool/SaveAs.sh
+++ b/test/sun/security/tools/policytool/SaveAs.sh
@@ -47,7 +47,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/policytool/UpdatePermissions.sh b/test/sun/security/tools/policytool/UpdatePermissions.sh
index 05978a38b5713e3952de7031a47f8a83af291b5a..70992074e2bf6d48dc427a8fe3c3ed02203a975c 100644
--- a/test/sun/security/tools/policytool/UpdatePermissions.sh
+++ b/test/sun/security/tools/policytool/UpdatePermissions.sh
@@ -47,7 +47,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/policytool/UsePolicy.sh b/test/sun/security/tools/policytool/UsePolicy.sh
index c8412389a3b2c048e4e68c939f671bc40d94e3bd..a1e3d34c6c431101024c7937bbe1ee52f9a69377 100644
--- a/test/sun/security/tools/policytool/UsePolicy.sh
+++ b/test/sun/security/tools/policytool/UsePolicy.sh
@@ -46,7 +46,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/security/tools/policytool/i18n.sh b/test/sun/security/tools/policytool/i18n.sh
index 58b59e060b29fedc6657403a9b8ad350b4aef6dd..18ce68dda28490c163732a7a98047dff1797974f 100644
--- a/test/sun/security/tools/policytool/i18n.sh
+++ b/test/sun/security/tools/policytool/i18n.sh
@@ -49,7 +49,7 @@ fi
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux | Darwin )
+  SunOS | Linux | Darwin | AIX )
     NULL=/dev/null
     PS=":"
     FS="/"
diff --git a/test/sun/tools/common/CommonSetup.sh b/test/sun/tools/common/CommonSetup.sh
index db58377a66804b6f2b383160d5a1ae52732d7531..f4401a7f6f2a1147dcaf6fc89cc22941c042c63d 100644
--- a/test/sun/tools/common/CommonSetup.sh
+++ b/test/sun/tools/common/CommonSetup.sh
@@ -48,6 +48,7 @@
 #   isSolaris - true if OS is Solaris
 #   isWindows - true if OS is Windows
 #   isMacos   - true if OS is Macos X
+#   isAIX     - true if OS is AIX
 
 
 if [ -z "${TESTJAVA}" ]; then
@@ -83,6 +84,7 @@ isSolaris=false
 isUnknownOS=false
 isWindows=false
 isMacos=false
+isAIX=false
 
 OS=`uname -s`
 
@@ -113,6 +115,10 @@ case "$OS" in
     OS="Solaris"
     isSolaris=true
     ;;
+  AIX )
+    OS="AIX"
+    isAIX=true
+    ;;
   Windows* )
     OS="Windows"
     PATTERN_EOL='[
]*$'
diff --git a/test/sun/tools/jconsole/ResourceCheckTest.sh b/test/sun/tools/jconsole/ResourceCheckTest.sh
index 01c2e4b6f010957158ab47eba022ca101b78dd31..b82b3ac387c2bf50d6dc09350d8ade8ceed47d97 100644
--- a/test/sun/tools/jconsole/ResourceCheckTest.sh
+++ b/test/sun/tools/jconsole/ResourceCheckTest.sh
@@ -54,7 +54,7 @@ pass()
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | Darwin)
+   SunOS | Linux | Darwin | AIX)
       PATHSEP=":"
       ;;
 
diff --git a/test/sun/tools/jinfo/Basic.sh b/test/sun/tools/jinfo/Basic.sh
index e12bbb3ce33fe4a8727a007981b6aa10aa7c1567..5905c83d009e7ab6e1606c7e8876609e99d5e371 100644
--- a/test/sun/tools/jinfo/Basic.sh
+++ b/test/sun/tools/jinfo/Basic.sh
@@ -45,7 +45,7 @@ failed=0
 
 runSA=true
 
-if [ $isMacos = true ]; then
+if [ $isMacos = true -o $isAIX = true -o `uname -m` = ppc64 ]; then
     runSA=false
 fi
 
diff --git a/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh b/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
index fa312adad747425fe24a8b0d03c88e0f032ab431..29c72ed6254f19e4388a5ac8c005781badcc375b 100644
--- a/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
+++ b/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
@@ -56,7 +56,7 @@ pass()
 
 OS=`uname -s`
 case "$OS" in
-   SunOS | Linux | Darwin )
+   SunOS | Linux | Darwin | AIX )
       PATHSEP=":"
       ;;
 
diff --git a/test/tools/launcher/ExecutionEnvironment.java b/test/tools/launcher/ExecutionEnvironment.java
index c3dc1abb9f69bbc8bccb3cb1c00a9b8fa4b25180..85bd96928149bfdcda42770025671f5267a68117 100644
--- a/test/tools/launcher/ExecutionEnvironment.java
+++ b/test/tools/launcher/ExecutionEnvironment.java
@@ -72,7 +72,9 @@ import java.util.regex.Pattern;
 public class ExecutionEnvironment extends TestHelper {
     static final String LD_LIBRARY_PATH    = TestHelper.isMacOSX
             ? "DYLD_LIBRARY_PATH"
-            : "LD_LIBRARY_PATH";
+            : TestHelper.isAIX
+                    ? "LIBPATH"
+                    : "LD_LIBRARY_PATH";
     static final String LD_LIBRARY_PATH_32 = LD_LIBRARY_PATH + "_32";
     static final String LD_LIBRARY_PATH_64 = LD_LIBRARY_PATH + "_64";
 
@@ -144,7 +146,19 @@ public class ExecutionEnvironment extends TestHelper {
 
         for (String x : LD_PATH_STRINGS) {
             if (!tr.contains(x)) {
-                flagError(tr, "FAIL: did not get <" + x + ">");
+                if (TestHelper.isAIX && x.startsWith(LD_LIBRARY_PATH)) {
+                    // AIX does not support the '-rpath' linker options so the
+                    // launchers have to prepend the jdk library path to 'LIBPATH'.
+                    String aixLibPath = LD_LIBRARY_PATH + "=" +
+                        System.getenv(LD_LIBRARY_PATH) +
+                        System.getProperty("path.separator") + LD_LIBRARY_PATH_VALUE;
+                    if (!tr.matches(aixLibPath)) {
+                        flagError(tr, "FAIL: did not get <" + aixLibPath + ">");
+                    }
+                }
+                else {
+                    flagError(tr, "FAIL: did not get <" + x + ">");
+                }
             }
         }
     }
@@ -180,7 +194,7 @@ public class ExecutionEnvironment extends TestHelper {
 
         Map<String, String> env = new HashMap<>();
 
-        if (TestHelper.isLinux || TestHelper.isMacOSX) {
+        if (TestHelper.isLinux || TestHelper.isMacOSX || TestHelper.isAIX) {
             for (String x : LD_PATH_STRINGS) {
                 String pairs[] = x.split("=");
                 env.put(pairs[0], pairs[1]);
diff --git a/test/tools/launcher/Settings.java b/test/tools/launcher/Settings.java
index 57a9ca644475845e0350dbfe1a2ae74e91c1e0db..16fd29b0b168a98182fef88eb2883a6bc2ab6558 100644
--- a/test/tools/launcher/Settings.java
+++ b/test/tools/launcher/Settings.java
@@ -73,16 +73,20 @@ public class Settings extends TestHelper {
     }
 
     static void runTestOptionDefault() throws IOException {
+        String stackSize = "256"; // in kb
+        if (getArch().equals("ppc64")) {
+            stackSize = "800";
+        }
         TestResult tr = null;
         tr = doExec(javaCmd, "-Xms64m", "-Xmx512m",
-                "-Xss256k", "-XshowSettings", "-jar", testJar.getAbsolutePath());
+                "-Xss" + stackSize + "k", "-XshowSettings", "-jar", testJar.getAbsolutePath());
         containsAllOptions(tr);
         if (!tr.isOK()) {
             System.out.println(tr.status);
             throw new RuntimeException("test fails");
         }
         tr = doExec(javaCmd, "-Xms65536k", "-Xmx712m",
-                "-Xss256000", "-XshowSettings", "-jar", testJar.getAbsolutePath());
+                "-Xss" + stackSize + "000", "-XshowSettings", "-jar", testJar.getAbsolutePath());
         containsAllOptions(tr);
         if (!tr.isOK()) {
             System.out.println(tr.status);
diff --git a/test/tools/launcher/TestHelper.java b/test/tools/launcher/TestHelper.java
index da23181a3f68ed59c1521578eaacc60f254f7222..40737320d52e617b7903160786eff6178a12b5da 100644
--- a/test/tools/launcher/TestHelper.java
+++ b/test/tools/launcher/TestHelper.java
@@ -92,6 +92,8 @@ public class TestHelper {
             System.getProperty("os.name", "unknown").startsWith("SunOS");
     static final boolean isLinux =
             System.getProperty("os.name", "unknown").startsWith("Linux");
+    static final boolean isAIX =
+            System.getProperty("os.name", "unknown").startsWith("AIX");
     static final String LIBJVM = isWindows
                         ? "jvm.dll"
                         : "libjvm" + (isMacOSX ? ".dylib" : ".so");