3 files changed, 11 insertions, 0 deletions

diff --git a/test/common/README.md b/test/common/README.md
index db32c48b40..5f8b6cb309 100644
--- a/test/common/README.md
+++ b/test/common/README.md
@@ -237,6 +237,11 @@ Attempts to 'kill' `pid`
 
 Platform check for Free BSD.
 
+### isIBMi
+* [<boolean>][]
+
+Platform check for IBMi.
+
 ### isLinux
 * [<boolean>][]
 
diff --git a/test/common/index.js b/test/common/index.js
index 888a1feba3..09b7f55778 100644
--- a/test/common/index.js
+++ b/test/common/index.js
@@ -102,6 +102,9 @@ if (process.argv.length === 2 &&
 
 const isWindows = process.platform === 'win32';
 const isAIX = process.platform === 'aix';
+// On IBMi, process.platform and os.platform() both return 'aix',
+// It is not enough to differentiate between IBMi and real AIX system.
+const isIBMi = os.type() === 'OS400';
 const isLinuxPPCBE = (process.platform === 'linux') &&
                      (process.arch === 'ppc64') &&
                      (os.endianness() === 'BE');
@@ -762,6 +765,7 @@ module.exports = {
   isAIX,
   isAlive,
   isFreeBSD,
+  isIBMi,
   isLinux,
   isLinuxPPCBE,
   isMainThread,
diff --git a/test/common/index.mjs b/test/common/index.mjs
index 5ad6ec3c11..54f6dc7f17 100644
--- a/test/common/index.mjs
+++ b/test/common/index.mjs
@@ -9,6 +9,7 @@ const {
   isMainThread,
   isWindows,
   isAIX,
+  isIBMi,
   isLinuxPPCBE,
   isSunOS,
   isFreeBSD,
@@ -55,6 +56,7 @@ export {
   isMainThread,
   isWindows,
   isAIX,
+  isIBMi,
   isLinuxPPCBE,
   isSunOS,
   isFreeBSD,