diff --git a/cicd/jenkins/kitchen-freebsd121-py3 b/cicd/jenkins/kitchen-freebsd121-py3
new file mode 100644
index 000000000000..fe02e4df04ea
--- /dev/null
+++ b/cicd/jenkins/kitchen-freebsd121-py3
@@ -0,0 +1,17 @@
+@Library('salt@master-1.7') _
+
+runTestSuite(
+    ami_image_id: 'ami-097c7303c2c839327',
+    concurrent_builds: 1,
+    distro_name: 'freebsd',
+    distro_version: '121',
+    env: env,
+    golden_images_branch: 'master',
+    jenkins_slave_label: 'kitchen-slave',
+    nox_env_name: 'runtests-zeromq',
+    nox_passthrough_opts: '--ssh-tests',
+    python_version: 'py3',
+    testrun_timeout: 6,
+    use_spot_instances: true)
+
+// vim: ft=groovy
diff --git a/cicd/jenkins/kitchen-freebsd121-py3-pytest b/cicd/jenkins/kitchen-freebsd121-py3-pytest
new file mode 100644
index 000000000000..04c905198fd3
--- /dev/null
+++ b/cicd/jenkins/kitchen-freebsd121-py3-pytest
@@ -0,0 +1,20 @@
+@Library('salt@master-1.7') _
+
+runTestSuite(
+    ami_image_id: 'ami-097c7303c2c839327',
+    concurrent_builds: 2,
+    distro_name: 'freebsd',
+    distro_version: '121',
+    env: env,
+    golden_images_branch: 'master',
+    jenkins_slave_label: 'kitchen-slave',
+    nox_env_name: 'pytest-zeromq',
+    nox_passthrough_opts: '--ssh-tests',
+    python_version: 'py3',
+    //splits: ['unit', 'integration', 'multimaster'],
+    testrun_timeout: 6,
+    use_spot_instances: true,
+    //fast_slow_staged_testrun: true
+)
+
+// vim: ft=groovy
diff --git a/tests/integration/files/file/base/issue-30161.sls b/tests/integration/files/file/base/issue-30161.sls
index 89024d98fd41..f7c69634bc34 100644
--- a/tests/integration/files/file/base/issue-30161.sls
+++ b/tests/integration/files/file/base/issue-30161.sls
@@ -1,7 +1,7 @@
 {% if grains['os'] == 'Windows' %}
   {% set test_false = 'cmd.exe /c exit 1' %}
   {% set test_true = 'cmd.exe /c exit 0' %}
-{% elif grains['os'] == 'MacOS' %}
+{% elif grains['os'] == 'MacOS' or grains['os'] == 'FreeBSD' %}
   {% set test_false = '/usr/bin/false' %}
   {% set test_true = '/usr/bin/true' %}
 {% else %}