diff --git a/Makefile.am b/Makefile.am
index 78eaad06..0c6f79d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -231,6 +231,7 @@ EXTRA_DIST = \
     test/conf/hmac_sha384_long_key_access.conf \
     test/conf/hmac_sha512_access.conf \
     test/conf/hmac_sha3_512_access.conf \
+    test/conf/hmac_sha3_256_access.conf \
     test/conf/hmac_sha512_short_key_access.conf \
     test/conf/hmac_sha512_short_key2_access.conf \
     test/conf/hmac_sha512_long_key_access.conf \
@@ -267,6 +268,7 @@ EXTRA_DIST = \
     test/conf/fwknoprc_hmac_sha384_short_key \
     test/conf/fwknoprc_hmac_sha512_key \
     test/conf/fwknoprc_hmac_sha3_512_key \
+    test/conf/fwknoprc_hmac_sha3_256_key \
     test/conf/fwknoprc_hmac_sha512_short_key \
     test/conf/fwknoprc_hmac_sha512_long_key \
     test/conf/fwknoprc_hmac_simple_keys \
diff --git a/test/test-fwknop.pl b/test/test-fwknop.pl
index a3aa5728..388533f3 100755
--- a/test/test-fwknop.pl
+++ b/test/test-fwknop.pl
@@ -443,6 +443,7 @@ our %cf = (
     'hmac_sha1_short_key_access'   => "$conf_dir/hmac_sha1_short_key_access.conf",
     'hmac_sha1_long_key_access'    => "$conf_dir/hmac_sha1_long_key_access.conf",
     'hmac_sha256_access'           => "$conf_dir/hmac_sha256_access.conf",
+    'hmac_sha3_256_access'         => "$conf_dir/hmac_sha3_256_access.conf",
     'hmac_sha256_digest1_mismatch_access' => "$conf_dir/hmac_sha256_digest1_mismatch_access.conf",
     'hmac_sha256_digest2_mismatch_access' => "$conf_dir/hmac_sha256_digest2_mismatch_access.conf",
     'hmac_sha256_digest3_mismatch_access' => "$conf_dir/hmac_sha256_digest3_mismatch_access.conf",
@@ -600,6 +601,7 @@ our %cf = (
     'rc_hmac_sha1_short_key'       => "$conf_dir/fwknoprc_hmac_sha1_short_key",
     'rc_hmac_sha1_long_key'        => "$conf_dir/fwknoprc_hmac_sha1_long_key",
     'rc_hmac_sha256_key'           => "$conf_dir/fwknoprc_hmac_sha256_key",
+    'rc_hmac_sha3_256_key'         => "$conf_dir/fwknoprc_hmac_sha3_256_key",
     'rc_hmac_sha256_short_key'     => "$conf_dir/fwknoprc_hmac_sha256_short_key",
     'rc_hmac_sha256_long_key'      => "$conf_dir/fwknoprc_hmac_sha256_long_key",
     'rc_hmac_sha384_key'           => "$conf_dir/fwknoprc_hmac_sha384_key",
diff --git a/test/tests/rijndael_hmac.pl b/test/tests/rijndael_hmac.pl
index ad81b816..e1819aec 100644
--- a/test/tests/rijndael_hmac.pl
+++ b/test/tests/rijndael_hmac.pl
@@ -1346,6 +1346,20 @@
         'fw_rule_removed' => $NEW_RULE_REMOVED,
         'key_file' => $cf{'rc_hmac_sha512_key'},
     },
+    {
+        'category' => 'Rijndael+HMAC',
+        'subcategory' => 'client+server',
+        'detail'   => 'complete cycle SHA3_256 (tcp/22 ssh)',
+        'function' => \&spa_cycle,
+        'cmdline'  => "$default_client_args_no_get_key --rc-file " .
+            "$cf{'rc_hmac_sha3_256_key'} --hmac-digest-type sha3_256",
+        'fwknopd_cmdline' => "$fwknopdCmd -c $cf{'def'} -a $cf{'hmac_sha3_256_access'} " .
+            "-d $default_digest_file -p $default_pid_file $intf_str",
+        'fw_rule_created' => $NEW_RULE_REQUIRED,
+        'fw_rule_removed' => $NEW_RULE_REMOVED,
+        'key_file' => $cf{'rc_hmac_sha3_256_key'},
+    },
+
     {
         'category' => 'Rijndael+HMAC',
         'subcategory' => 'client+server',