diff --git a/tests/.gitignore b/tests/.gitignore
index dc32d701..249acc91 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -66,3 +66,4 @@ util.pyc
 56-basic-iterate_syscalls
 57-basic-rawsysrc
 58-live-tsync_notify
+59-basic-empty_binary_tree
diff --git a/tests/59-basic-empty_binary_tree.c b/tests/59-basic-empty_binary_tree.c
new file mode 100644
index 00000000..6b6485e6
--- /dev/null
+++ b/tests/59-basic-empty_binary_tree.c
@@ -0,0 +1,54 @@
+/**
+ * Seccomp Library test program
+ *
+ * Copyright (c) 2018-2020 Oracle and/or its affiliates.
+ * Author: Tom Hromatka <tom.hromatka@oracle.com>
+ */
+
+/*
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of version 2.1 of the GNU Lesser General Public License as
+ * published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses>.
+ */
+
+#include <errno.h>
+#include <unistd.h>
+
+#include <seccomp.h>
+
+#include "util.h"
+
+int main(int argc, char *argv[])
+{
+	int rc;
+	struct util_options opts;
+	scmp_filter_ctx ctx = NULL;
+
+	rc = util_getopt(argc, argv, &opts);
+	if (rc < 0)
+		goto out;
+
+	ctx = seccomp_init(SCMP_ACT_ALLOW);
+	if (ctx == NULL)
+		return ENOMEM;
+
+	rc = seccomp_attr_set(ctx, SCMP_FLTATR_CTL_OPTIMIZE, 2);
+	if (rc < 0)
+		goto out;
+
+	rc = util_filter_output(&opts, ctx);
+	if (rc)
+		goto out;
+
+out:
+	seccomp_release(ctx);
+	return (rc < 0 ? -rc : rc);
+}
diff --git a/tests/59-basic-empty_binary_tree.py b/tests/59-basic-empty_binary_tree.py
new file mode 100755
index 00000000..5acbbd44
--- /dev/null
+++ b/tests/59-basic-empty_binary_tree.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env python
+
+#
+# Seccomp Library test program
+#
+# Copyright (c) 2022 Oracle and/or its affiliates.
+# Author: Tom Hromatka <tom.hromatka@oracle.com>
+#
+
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of version 2.1 of the GNU Lesser General Public License as
+# published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library; if not, see <http://www.gnu.org/licenses>.
+#
+
+import argparse
+import sys
+
+import util
+
+from seccomp import *
+
+def test(args):
+    f = SyscallFilter(ALLOW)
+    f.set_attr(Attr.CTL_OPTIMIZE, 2)
+    return f
+
+args = util.get_opt()
+ctx = test(args)
+util.filter_output(args, ctx)
+
+# kate: syntax python;
+# kate: indent-mode python; space-indent on; indent-width 4; mixedindent off;
diff --git a/tests/59-basic-empty_binary_tree.tests b/tests/59-basic-empty_binary_tree.tests
new file mode 100644
index 00000000..ff6dbc32
--- /dev/null
+++ b/tests/59-basic-empty_binary_tree.tests
@@ -0,0 +1,16 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright (c) 2022 Oracle and/or its affiliates.
+# Author: Tom Hromatka <tom.hromatka@oracle.com>
+#
+
+test type: bpf-sim
+
+# Testname	Arch		Syscall	Arg0	Arg1	Arg2	Arg3	Arg4	Arg5	Result
+59-basic-empty_binary_tree	all,-x32	0-350	N	N	N	N	N	N	ALLOW
+
+test type: bpf-valgrind
+
+# Testname
+59-basic-empty_binary_tree
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b39ee067..f0a1f8eb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -93,7 +93,8 @@ check_PROGRAMS = \
 	55-basic-pfc_binary_tree \
 	56-basic-iterate_syscalls \
 	57-basic-rawsysrc \
-	58-live-tsync_notify
+	58-live-tsync_notify \
+	59-basic-empty_binary_tree
 
 EXTRA_DIST_TESTPYTHON = \
 	util.py \
@@ -152,7 +153,8 @@ EXTRA_DIST_TESTPYTHON = \
 	54-live-binary_tree.py \
 	56-basic-iterate_syscalls.py \
 	57-basic-rawsysrc.py \
-	58-live-tsync_notify.py
+	58-live-tsync_notify.py \
+	59-basic-empty_binary_tree.py
 
 EXTRA_DIST_TESTCFGS = \
 	01-sim-allow.tests \
@@ -212,7 +214,8 @@ EXTRA_DIST_TESTCFGS = \
 	55-basic-pfc_binary_tree.tests \
 	56-basic-iterate_syscalls.tests \
 	57-basic-rawsysrc.tests \
-	58-live-tsync_notify.tests
+	58-live-tsync_notify.tests \
+	59-basic-empty_binary_tree.tests
 
 EXTRA_DIST_TESTSCRIPTS = \
 	38-basic-pfc_coverage.sh 38-basic-pfc_coverage.pfc \