diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/util/OsUtil.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/util/OsUtil.java
index d7a3840a9f4..63e49c66c4e 100644
--- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/util/OsUtil.java
+++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/util/OsUtil.java
@@ -56,6 +56,8 @@ public class OsUtil {
             return new OsArch("sunos5", "x86_64");
         } else if (os.startsWith("mac os x")) {
             return new OsArch("osx", "x86_64");
+        } else if (os.startsWith("freebsd")) {
+            return new OsArch("freebsd", arch);
         }
 
         // unsupported platform
diff --git a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/util/OsUtil.java b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/util/OsUtil.java
index c0b9974035a..0bbb490a091 100644
--- a/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/util/OsUtil.java
+++ b/integration/client-cli/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/util/OsUtil.java
@@ -40,6 +40,8 @@ public class OsUtil {
             return new OsArch("sunos5", "x86_64");
         } else if (os.startsWith("mac os x")) {
             return new OsArch("osx", "x86_64");
+        } else if (os.startsWith("freebsd")) {
+            return new OsArch("freebsd", arch);
         }
 
         // unsupported platform
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/OsUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/OsUtils.java
index 4944603ae9f..a0a282f4a00 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/OsUtils.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/OsUtils.java
@@ -37,6 +37,8 @@ public class OsUtils {
             return new OsArch("sunos5", "x86_64");
         } else if (os.startsWith("mac os x")) {
             return new OsArch("osx", "x86_64");
+        } else if (os.startsWith("freebsd")) {
+            return new OsArch("freebsd", arch);
         }
 
         // unsupported platform