diff --git a/test/common/README.md b/test/common/README.md
index 1a633fb719..44e9c4e8cd 100644
--- a/test/common/README.md
+++ b/test/common/README.md
@@ -155,7 +155,7 @@ the number of calls.
 
 Checks whether free BSD Jail is true or false.
 
-### isAix
+### isAIX
 * return [<Boolean>]
 
 Platform check for Advanced Interactive eXecutive (AIX).
diff --git a/test/common/index.js b/test/common/index.js
index 26b5e19732..64127e4c33 100644
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -43,7 +43,7 @@ exports.PORT = +process.env.NODE_COMMON_PORT || 12346;
 exports.isWindows = process.platform === 'win32';
 exports.isWOW64 = exports.isWindows &&
                   (process.env.PROCESSOR_ARCHITEW6432 !== undefined);
-exports.isAix = process.platform === 'aix';
+exports.isAIX = process.platform === 'aix';
 exports.isLinuxPPCBE = (process.platform === 'linux') &&
                        (process.arch === 'ppc64') &&
                        (os.endianness() === 'BE');
@@ -330,7 +330,7 @@ exports.platformTimeout = function(ms) {
   if (global.__coverage__)
     ms = 4 * ms;
 
-  if (exports.isAix)
+  if (exports.isAIX)
     return 2 * ms; // default localhost speed is slower on AIX
 
   if (process.arch !== 'arm')
diff --git a/test/known_issues/test-cwd-enoent-file.js b/test/known_issues/test-cwd-enoent-file.js
index b2f59cbca7..01e6e8359f 100644
--- a/test/known_issues/test-cwd-enoent-file.js
+++ b/test/known_issues/test-cwd-enoent-file.js
@@ -5,7 +5,7 @@
 const common = require('../common');
 const assert = require('assert');
 
-if (common.isSunOS || common.isWindows || common.isAix) {
+if (common.isSunOS || common.isWindows || common.isAIX) {
   // The current working directory cannot be removed on these platforms.
   // Change this to common.skip() when this is no longer a known issue test.
   assert.fail('cannot rmdir current working directory');
diff --git a/test/parallel/test-cwd-enoent-preload.js b/test/parallel/test-cwd-enoent-preload.js
index 8979547c0d..5f22ee1e90 100644
--- a/test/parallel/test-cwd-enoent-preload.js
+++ b/test/parallel/test-cwd-enoent-preload.js
@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../common');
 // Fails with EINVAL on SmartOS, EBUSY on Windows, EBUSY on AIX.
-if (common.isSunOS || common.isWindows || common.isAix)
+if (common.isSunOS || common.isWindows || common.isAIX)
   common.skip('cannot rmdir current working directory');
 
 const assert = require('assert');
diff --git a/test/parallel/test-cwd-enoent-repl.js b/test/parallel/test-cwd-enoent-repl.js
index bb41b1fccd..8f846af903 100644
--- a/test/parallel/test-cwd-enoent-repl.js
+++ b/test/parallel/test-cwd-enoent-repl.js
@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../common');
 // Fails with EINVAL on SmartOS, EBUSY on Windows, EBUSY on AIX.
-if (common.isSunOS || common.isWindows || common.isAix)
+if (common.isSunOS || common.isWindows || common.isAIX)
   common.skip('cannot rmdir current working directory');
 
 const assert = require('assert');
diff --git a/test/parallel/test-cwd-enoent.js b/test/parallel/test-cwd-enoent.js
index 27df46acf8..c1b520aedd 100644
--- a/test/parallel/test-cwd-enoent.js
+++ b/test/parallel/test-cwd-enoent.js
@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../common');
 // Fails with EINVAL on SmartOS, EBUSY on Windows, EBUSY on AIX.
-if (common.isSunOS || common.isWindows || common.isAix)
+if (common.isSunOS || common.isWindows || common.isAIX)
   common.skip('cannot rmdir current working directory');
 
 const assert = require('assert');
diff --git a/test/parallel/test-fs-readfile-pipe-large.js b/test/parallel/test-fs-readfile-pipe-large.js
index 46603b14fa..4d278ee0f2 100644
--- a/test/parallel/test-fs-readfile-pipe-large.js
+++ b/test/parallel/test-fs-readfile-pipe-large.js
@@ -3,7 +3,7 @@ const common = require('../common');
 
 // simulate `cat readfile.js | node readfile.js`
 
-if (common.isWindows || common.isAix)
+if (common.isWindows || common.isAIX)
   common.skip(`No /dev/stdin on ${process.platform}.`);
 
 const assert = require('assert');
diff --git a/test/parallel/test-fs-readfile-pipe.js b/test/parallel/test-fs-readfile-pipe.js
index e15c2c1047..0c26d7c287 100644
--- a/test/parallel/test-fs-readfile-pipe.js
+++ b/test/parallel/test-fs-readfile-pipe.js
@@ -24,7 +24,7 @@ const common = require('../common');
 
 // simulate `cat readfile.js | node readfile.js`
 
-if (common.isWindows || common.isAix)
+if (common.isWindows || common.isAIX)
   common.skip(`No /dev/stdin on ${process.platform}.`);
 
 const assert = require('assert');
diff --git a/test/parallel/test-fs-readfilesync-pipe-large.js b/test/parallel/test-fs-readfilesync-pipe-large.js
index daa53bf3de..f9dea90d10 100644
--- a/test/parallel/test-fs-readfilesync-pipe-large.js
+++ b/test/parallel/test-fs-readfilesync-pipe-large.js
@@ -3,7 +3,7 @@ const common = require('../common');
 
 // simulate `cat readfile.js | node readfile.js`
 
-if (common.isWindows || common.isAix)
+if (common.isWindows || common.isAIX)
   common.skip(`No /dev/stdin on ${process.platform}.`);
 
 const assert = require('assert');
diff --git a/test/parallel/test-fs-realpath-pipe.js b/test/parallel/test-fs-realpath-pipe.js
index 0f30b07f0a..55010cf78b 100644
--- a/test/parallel/test-fs-realpath-pipe.js
+++ b/test/parallel/test-fs-realpath-pipe.js
@@ -2,7 +2,7 @@
 
 const common = require('../common');
 
-if (common.isWindows || common.isAix)
+if (common.isWindows || common.isAIX)
   common.skip(`No /dev/stdin on ${process.platform}.`);
 
 const assert = require('assert');
diff --git a/test/parallel/test-fs-watch-encoding.js b/test/parallel/test-fs-watch-encoding.js
index b9488f7a7f..18b6f2ecf6 100644
--- a/test/parallel/test-fs-watch-encoding.js
+++ b/test/parallel/test-fs-watch-encoding.js
@@ -16,7 +16,7 @@ const common = require('../common');
 // The testcase makes use of folder watching, and causes
 // hang. This behavior is documented. Skip this for AIX.
 
-if (common.isAix)
+if (common.isAIX)
   common.skip('folder watch capability is limited in AIX.');
 
 const fs = require('fs');
diff --git a/test/parallel/test-fs-watch.js b/test/parallel/test-fs-watch.js
index 6edb141129..bf5fc9a8e1 100644
--- a/test/parallel/test-fs-watch.js
+++ b/test/parallel/test-fs-watch.js
@@ -21,7 +21,7 @@ class WatchTestCase {
 const cases = [
   // Watch on a directory should callback with a filename on supported systems
   new WatchTestCase(
-    common.isLinux || common.isOSX || common.isWindows || common.isAix,
+    common.isLinux || common.isOSX || common.isWindows || common.isAIX,
     'watch1',
     'foo',
     'filePath'
diff --git a/test/parallel/test-os.js b/test/parallel/test-os.js
index a62c8b8512..016ee69a85 100644
--- a/test/parallel/test-os.js
+++ b/test/parallel/test-os.js
@@ -93,7 +93,7 @@ const release = os.release();
 is.string(release);
 assert.ok(release.length > 0);
 //TODO: Check format on more than just AIX
-if (common.isAix)
+if (common.isAIX)
   assert.ok(/^\d+\.\d+$/.test(release));
 
 const platform = os.platform();
diff --git a/test/pseudo-tty/no_dropped_stdio.js b/test/pseudo-tty/no_dropped_stdio.js
index 6aa721df35..f140860c01 100644
--- a/test/pseudo-tty/no_dropped_stdio.js
+++ b/test/pseudo-tty/no_dropped_stdio.js
@@ -16,4 +16,4 @@ out += `${'o'.repeat(24)}O`;
 setTimeout(function() {
   process.stdout.write(out);
   process.exit(0);
-}, common.isAix ? 200 : 0);
+}, common.isAIX ? 200 : 0);
diff --git a/test/pseudo-tty/no_interleaved_stdio.js b/test/pseudo-tty/no_interleaved_stdio.js
index 3f1e7b5fb1..81ba49b9ae 100644
--- a/test/pseudo-tty/no_interleaved_stdio.js
+++ b/test/pseudo-tty/no_interleaved_stdio.js
@@ -18,4 +18,4 @@ const err = '__This is some stderr__';
 setTimeout(function() {
   process.stdout.write(out);
   process.stderr.write(err);
-}, common.isAix ? 200 : 0);
+}, common.isAIX ? 200 : 0);
diff --git a/test/pseudo-tty/test-stderr-stdout-handle-sigwinch.js b/test/pseudo-tty/test-stderr-stdout-handle-sigwinch.js
index 4d87e15d34..d5f187d1c3 100644
--- a/test/pseudo-tty/test-stderr-stdout-handle-sigwinch.js
+++ b/test/pseudo-tty/test-stderr-stdout-handle-sigwinch.js
@@ -31,4 +31,4 @@ process.stdout._refreshSize = wrap(originalRefreshSizeStdout,
 // can setup the readloop. Provide a reasonable delay.
 setTimeout(function() {
   process.emit('SIGWINCH');
-}, common.isAix ? 200 : 0);
+}, common.isAIX ? 200 : 0);
diff --git a/test/sequential/test-fs-watch.js b/test/sequential/test-fs-watch.js
index 70c165ea79..d7750582b0 100644
--- a/test/sequential/test-fs-watch.js
+++ b/test/sequential/test-fs-watch.js
@@ -28,7 +28,7 @@ const fs = require('fs');
 const expectFilePath = common.isWindows ||
                        common.isLinux ||
                        common.isOSX ||
-                       common.isAix;
+                       common.isAIX;
 
 let watchSeenOne = 0;
 let watchSeenTwo = 0;
@@ -102,7 +102,7 @@ const filepathThree = path.join(testsubdir, filenameThree);
 assert.doesNotThrow(
     function() {
       const watcher = fs.watch(testsubdir, function(event, filename) {
-        const renameEv = common.isSunOS || common.isAix ? 'change' : 'rename';
+        const renameEv = common.isSunOS || common.isAIX ? 'change' : 'rename';
         assert.strictEqual(event, renameEv);
         if (expectFilePath) {
           assert.strictEqual(filename, 'newfile.txt');
diff --git a/test/tick-processor/test-tick-processor-builtin.js b/test/tick-processor/test-tick-processor-builtin.js
index 0fb839f8d1..f94964813a 100644
--- a/test/tick-processor/test-tick-processor-builtin.js
+++ b/test/tick-processor/test-tick-processor-builtin.js
@@ -6,7 +6,7 @@ if (!common.enoughTestCpu)
 
 if (common.isWindows ||
     common.isSunOS ||
-    common.isAix ||
+    common.isAIX ||
     common.isLinuxPPCBE ||
     common.isFreeBSD)
   common.skip('C++ symbols are not mapped for this os.');
diff --git a/test/tick-processor/test-tick-processor-cpp-core.js b/test/tick-processor/test-tick-processor-cpp-core.js
index dc1aed41a7..496d06b555 100644
--- a/test/tick-processor/test-tick-processor-cpp-core.js
+++ b/test/tick-processor/test-tick-processor-cpp-core.js
@@ -6,7 +6,7 @@ if (!common.enoughTestCpu)
 
 if (common.isWindows ||
     common.isSunOS ||
-    common.isAix ||
+    common.isAIX ||
     common.isLinuxPPCBE ||
     common.isFreeBSD)
   common.skip('C++ symbols are not mapped for this os.');
diff --git a/test/tick-processor/test-tick-processor-unknown.js b/test/tick-processor/test-tick-processor-unknown.js
index c0f5f332b2..182f8c957c 100644
--- a/test/tick-processor/test-tick-processor-unknown.js
+++ b/test/tick-processor/test-tick-processor-unknown.js
@@ -6,7 +6,7 @@ const common = require('../common');
 // the full 64 bits and the result is that it does not process the
 // addresses correctly and runs out of memory
 // Disabling until we get a fix upstreamed into V8
-if (common.isAix)
+if (common.isAIX)
   common.skip('AIX address range too big for scripts.');
 
 if (!common.enoughTestCpu)