tests: rename the tests to make it clear which are simulator/basic/live based

This patch only renames files, it makes not changes to the content.

Signed-off-by: Paul Moore <pmoore@redhat.com>

72 files changed, 414 insertions, 414 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index 69a083c..da6eee6 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,22 +1,22 @@
 *.bpf
 *.pfc
 util.pyc
-01-allow
-02-basic
-03-basic-chains
-04-multilevel-chains
-05-long-jumps
-06-actions
-07-db-bug-looping
-08-subtree-checks
-09-syscall-priority-pre
-10-syscall-priority-post
-11-basic-errors
-12-basic-masked-ops
-13-attrs
-14-reset
-15-resolver
-16-arch-basic
-17-arch-merge
-18-basic-whitelist
-19-missing-syscalls
+01-sim-allow
+02-sim-basic
+03-sim-basic_chains
+04-sim-multilevel_chains
+05-sim-long_jumps
+06-sim-actions
+07-sim-db_bug_looping
+08-sim-subtree_checks
+09-sim-syscall_priority_pre
+10-sim-syscall_priority_post
+11-basic-basic_errors
+12-sim-basic_masked_ops
+13-basic-attrs
+14-sim-reset
+15-basic-resolver
+16-sim-arch_basic
+17-sim-arch_merge
+18-sim-basic_whitelist
+19-sim-missing_syscalls
diff --git a/tests/01-allow.c b/tests/01-sim-allow.c
index 5f4f74d..5f4f74d 100644
--- a/tests/01-allow.c
+++ b/tests/01-sim-allow.c
diff --git a/tests/01-allow.py b/tests/01-sim-allow.py
index db3656b..db3656b 100755
--- a/tests/01-allow.py
+++ b/tests/01-sim-allow.py
diff --git a/tests/01-allow.tests b/tests/01-sim-allow.tests
index 449b0f2..e3da13c 100644
--- a/tests/01-allow.tests
+++ b/tests/01-sim-allow.tests
@@ -8,9 +8,9 @@
 test type: bpf-sim
 
 # Testname	Arch	Syscall	Arg0	Arg1	Arg2	Arg3	Arg4	Arg5	Result
-01-allow	all	0-350	N	N	N	N	N	N	ALLOW
+01-sim-allow	all	0-350	N	N	N	N	N	N	ALLOW
 
 test type: bpf-sim-fuzz
 
 # Testname	StressCount
-01-allow	50
+01-sim-allow	50
diff --git a/tests/02-basic.tests b/tests/02-basic.tests
deleted file mode 100644
index a9627cd..0000000
--- a/tests/02-basic.tests
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright IBM Corp. 2012
-# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
-#
-
-test type: bpf-sim
-
-# Testname	Arch	Syscall		Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
-02-basic	all	read		0		0x856B008	40	N	N	N	ALLOW
-02-basic	all	write		1		0x856B008	40	N	N	N	ALLOW
-02-basic	all	close		4		N		N	N	N	N	ALLOW
-02-basic	all	rt_sigreturn	N		N		N	N	N	N	ALLOW
-02-basic	all	open		0x856B008	4		N	N	N	N	KILL
-02-basic	x86	0-2		N		N		N	N	N	N	KILL
-02-basic	x86	7-172		N		N		N	N	N	N	KILL
-02-basic	x86	174-350		N		N		N	N	N	N	KILL
-02-basic	x86_64	4-14		N		N		N	N	N	N	KILL
-02-basic	x86_64	16-350		N		N		N	N	N	N	KILL
-
-test type: bpf-sim-fuzz
-
-# Testname	StressCount
-02-basic	50
diff --git a/tests/02-basic.c b/tests/02-sim-basic.c
index b601554..b601554 100644
--- a/tests/02-basic.c
+++ b/tests/02-sim-basic.c
diff --git a/tests/02-basic.py b/tests/02-sim-basic.py
index 868664f..868664f 100755
--- a/tests/02-basic.py
+++ b/tests/02-sim-basic.py
diff --git a/tests/02-sim-basic.tests b/tests/02-sim-basic.tests
new file mode 100644
index 0000000..2121d37
--- /dev/null
+++ b/tests/02-sim-basic.tests
@@ -0,0 +1,25 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright IBM Corp. 2012
+# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
+#
+
+test type: bpf-sim
+
+# Testname	Arch	Syscall		Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
+02-sim-basic	all	read		0		0x856B008	40	N	N	N	ALLOW
+02-sim-basic	all	write		1		0x856B008	40	N	N	N	ALLOW
+02-sim-basic	all	close		4		N		N	N	N	N	ALLOW
+02-sim-basic	all	rt_sigreturn	N		N		N	N	N	N	ALLOW
+02-sim-basic	all	open		0x856B008	4		N	N	N	N	KILL
+02-sim-basic	x86	0-2		N		N		N	N	N	N	KILL
+02-sim-basic	x86	7-172		N		N		N	N	N	N	KILL
+02-sim-basic	x86	174-350		N		N		N	N	N	N	KILL
+02-sim-basic	x86_64	4-14		N		N		N	N	N	N	KILL
+02-sim-basic	x86_64	16-350		N		N		N	N	N	N	KILL
+
+test type: bpf-sim-fuzz
+
+# Testname	StressCount
+02-sim-basic	50
diff --git a/tests/03-basic-chains.tests b/tests/03-basic-chains.tests
deleted file mode 100644
index c9dccb0..0000000
--- a/tests/03-basic-chains.tests
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright IBM Corp. 2012
-# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
-#
-
-test type: bpf-sim
-
-# Testname	Arch	Syscall		Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
-03-basic-chains	all	read		0		0x856B008	10	N	N	N	ALLOW
-03-basic-chains	all	read		1-10		0x856B008	10	N	N	N	KILL
-03-basic-chains	all	write		1-2		0x856B008	10	N	N	N	ALLOW
-03-basic-chains	all	write		3-10		0x856B008	10	N	N	N	KILL
-03-basic-chains	all	close		N		N		N	N	N	N	ALLOW
-03-basic-chains	all	rt_sigreturn	N		N		N	N	N	N	ALLOW
-03-basic-chains	all	open		0x856B008	4		N	N	N	N	KILL
-03-basic-chains	x86	0-2		N		N		N	N	N	N	KILL
-03-basic-chains	x86	7-172		N		N		N	N	N	N	KILL
-03-basic-chains	x86	174-350		N		N		N	N	N	N	KILL
-03-basic-chains	x86_64	4-14		N		N		N	N	N	N	KILL
-03-basic-chains	x86_64	16-350		N		N		N	N	N	N	KILL
-
-test type: bpf-sim-fuzz
-
-# Testname	StressCount
-03-basic-chains	50
diff --git a/tests/03-basic-chains.c b/tests/03-sim-basic_chains.c
index 6e7309b..6e7309b 100644
--- a/tests/03-basic-chains.c
+++ b/tests/03-sim-basic_chains.c
diff --git a/tests/03-basic-chains.py b/tests/03-sim-basic_chains.py
index 324170d..324170d 100755
--- a/tests/03-basic-chains.py
+++ b/tests/03-sim-basic_chains.py
diff --git a/tests/03-sim-basic_chains.tests b/tests/03-sim-basic_chains.tests
new file mode 100644
index 0000000..6692640
--- /dev/null
+++ b/tests/03-sim-basic_chains.tests
@@ -0,0 +1,27 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright IBM Corp. 2012
+# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
+#
+
+test type: bpf-sim
+
+# Testname		Arch	Syscall		Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
+03-sim-basic_chains	all	read		0		0x856B008	10	N	N	N	ALLOW
+03-sim-basic_chains	all	read		1-10		0x856B008	10	N	N	N	KILL
+03-sim-basic_chains	all	write		1-2		0x856B008	10	N	N	N	ALLOW
+03-sim-basic_chains	all	write		3-10		0x856B008	10	N	N	N	KILL
+03-sim-basic_chains	all	close		N		N		N	N	N	N	ALLOW
+03-sim-basic_chains	all	rt_sigreturn	N		N		N	N	N	N	ALLOW
+03-sim-basic_chains	all	open		0x856B008	4		N	N	N	N	KILL
+03-sim-basic_chains	x86	0-2		N		N		N	N	N	N	KILL
+03-sim-basic_chains	x86	7-172		N		N		N	N	N	N	KILL
+03-sim-basic_chains	x86	174-350		N		N		N	N	N	N	KILL
+03-sim-basic_chains	x86_64	4-14		N		N		N	N	N	N	KILL
+03-sim-basic_chains	x86_64	16-350		N		N		N	N	N	N	KILL
+
+test type: bpf-sim-fuzz
+
+# Testname		StressCount
+03-sim-basic_chains	50
diff --git a/tests/04-multilevel-chains.tests b/tests/04-multilevel-chains.tests
deleted file mode 100644
index 0a26cc2..0000000
--- a/tests/04-multilevel-chains.tests
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright IBM Corp. 2012
-# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
-#
-
-test type: bpf-sim
-
-# Testname		Arch	Syscall		Arg0		Arg1		Arg2			Arg3	Arg4	Arg5	Result
-04-multilevel-chains	all	open		0x856B008	4		N			N	N	N	ALLOW
-04-multilevel-chains	all	close		4		N		N			N	N	N	ALLOW
-04-multilevel-chains	x86	read		0		0x856B008	0x7FFFFFFE		N	N	N	ALLOW
-04-multilevel-chains	x86_64	read		0		0x856B008	0x7FFFFFFFFFFFFFFE	N	N	N	ALLOW
-04-multilevel-chains	x86	read		0		0x856B008	0x7FFFFFFF		N	N	N	KILL
-04-multilevel-chains	x86_64	read		0		0x856B008	0x7FFFFFFFFFFFFFFF	N	N	N	KILL
-04-multilevel-chains	x86	read		0		0		0x7FFFFFFE		N	N	N	KILL
-04-multilevel-chains	x86_64	read		0		0		0x7FFFFFFFFFFFFFFE	N	N	N	KILL
-04-multilevel-chains	all	read		1-10		0x856B008	0x7FFFFFFE		N	N	N	KILL
-04-multilevel-chains	x86	write		1-2		0x856B008	0x7FFFFFFE		N	N	N	ALLOW
-04-multilevel-chains	x86_64	write		1-2		0x856B008	0x7FFFFFFFFFFFFFFE	N	N	N	ALLOW
-04-multilevel-chains	x86	write		1-2		0		0x7FFFFFFE		N	N	N	KILL
-04-multilevel-chains	x86_64	write		1-2		0		0x7FFFFFFFFFFFFFFE	N	N	N	KILL
-04-multilevel-chains	x86	write		1-2		0x856B008	0x7FFFFFFF		N	N	N	KILL
-04-multilevel-chains	x86_64	write		1-2		0x856B008	0x7FFFFFFFFFFFFFFF	N	N	N	KILL
-04-multilevel-chains	all	write		3-10		0x856B008	0x7FFFFFFE		N	N	N	KILL
-04-multilevel-chains	all	rt_sigreturn	N		N		N			N	N	N	ALLOW
-04-multilevel-chains	x86	0-2		N		N		N			N	N	N	KILL
-04-multilevel-chains	x86	7-172		N		N		N			N	N	N	KILL
-04-multilevel-chains	x86	174-350		N		N		N			N	N	N	KILL
-04-multilevel-chains	x86_64	4-14		N		N		N			N	N	N	KILL
-04-multilevel-chains	x86_64	16-350		N		N		N			N	N	N	KILL
-
-test type: bpf-sim-fuzz
-
-# Testname		StressCount
-04-multilevel-chains	50
diff --git a/tests/04-multilevel-chains.c b/tests/04-sim-multilevel_chains.c
index aeff58b..aeff58b 100644
--- a/tests/04-multilevel-chains.c
+++ b/tests/04-sim-multilevel_chains.c
diff --git a/tests/04-multilevel-chains.py b/tests/04-sim-multilevel_chains.py
index e40deee..e40deee 100755
--- a/tests/04-multilevel-chains.py
+++ b/tests/04-sim-multilevel_chains.py
diff --git a/tests/04-sim-multilevel_chains.tests b/tests/04-sim-multilevel_chains.tests
new file mode 100644
index 0000000..6f50562
--- /dev/null
+++ b/tests/04-sim-multilevel_chains.tests
@@ -0,0 +1,37 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright IBM Corp. 2012
+# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
+#
+
+test type: bpf-sim
+
+# Testname			Arch	Syscall		Arg0		Arg1		Arg2			Arg3	Arg4	Arg5	Result
+04-sim-multilevel_chains	all	open		0x856B008	4		N			N	N	N	ALLOW
+04-sim-multilevel_chains	all	close		4		N		N			N	N	N	ALLOW
+04-sim-multilevel_chains	x86	read		0		0x856B008	0x7FFFFFFE		N	N	N	ALLOW
+04-sim-multilevel_chains	x86_64	read		0		0x856B008	0x7FFFFFFFFFFFFFFE	N	N	N	ALLOW
+04-sim-multilevel_chains	x86	read		0		0x856B008	0x7FFFFFFF		N	N	N	KILL
+04-sim-multilevel_chains	x86_64	read		0		0x856B008	0x7FFFFFFFFFFFFFFF	N	N	N	KILL
+04-sim-multilevel_chains	x86	read		0		0		0x7FFFFFFE		N	N	N	KILL
+04-sim-multilevel_chains	x86_64	read		0		0		0x7FFFFFFFFFFFFFFE	N	N	N	KILL
+04-sim-multilevel_chains	all	read		1-10		0x856B008	0x7FFFFFFE		N	N	N	KILL
+04-sim-multilevel_chains	x86	write		1-2		0x856B008	0x7FFFFFFE		N	N	N	ALLOW
+04-sim-multilevel_chains	x86_64	write		1-2		0x856B008	0x7FFFFFFFFFFFFFFE	N	N	N	ALLOW
+04-sim-multilevel_chains	x86	write		1-2		0		0x7FFFFFFE		N	N	N	KILL
+04-sim-multilevel_chains	x86_64	write		1-2		0		0x7FFFFFFFFFFFFFFE	N	N	N	KILL
+04-sim-multilevel_chains	x86	write		1-2		0x856B008	0x7FFFFFFF		N	N	N	KILL
+04-sim-multilevel_chains	x86_64	write		1-2		0x856B008	0x7FFFFFFFFFFFFFFF	N	N	N	KILL
+04-sim-multilevel_chains	all	write		3-10		0x856B008	0x7FFFFFFE		N	N	N	KILL
+04-sim-multilevel_chains	all	rt_sigreturn	N		N		N			N	N	N	ALLOW
+04-sim-multilevel_chains	x86	0-2		N		N		N			N	N	N	KILL
+04-sim-multilevel_chains	x86	7-172		N		N		N			N	N	N	KILL
+04-sim-multilevel_chains	x86	174-350		N		N		N			N	N	N	KILL
+04-sim-multilevel_chains	x86_64	4-14		N		N		N			N	N	N	KILL
+04-sim-multilevel_chains	x86_64	16-350		N		N		N			N	N	N	KILL
+
+test type: bpf-sim-fuzz
+
+# Testname			StressCount
+04-sim-multilevel_chains	50
diff --git a/tests/05-long-jumps.tests b/tests/05-long-jumps.tests
deleted file mode 100644
index f8823e7..0000000
--- a/tests/05-long-jumps.tests
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright IBM Corp. 2012
-# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
-#
-
-test type: bpf-sim
-
-# Testname	Arch	Syscall	Arg0	Arg1		Arg2			Arg3	Arg4	Arg5	Result
-05-long-jumps	all	1	1	2		3			4	5	6	ALLOW
-05-long-jumps	all	2	N	N		N			N	N	N	KILL
-05-long-jumps	all	999	N	N		N			N	N	N	KILL
-05-long-jumps	x86	1000	0-5 	0x856B008	0x7FFFFFFE		N	N	N	ALLOW
-05-long-jumps	x86_64	1000	0-5 	0x856B008	0x7FFFFFFFFFFFFFFE	N	N	N	ALLOW
-05-long-jumps	x86	1000	95-99	0x856B008	0x7FFFFFFE		N	N	N	ALLOW
-05-long-jumps	x86_64	1000	95-99	0x856B008	0x7FFFFFFFFFFFFFFE	N	N	N	ALLOW
-05-long-jumps	x86	1000	100	0x856B008	0x7FFFFFFE		N	N	N	KILL
-05-long-jumps	x86_64	1000	100	0x856B008	0x7FFFFFFFFFFFFFFE	N	N	N	KILL
-05-long-jumps	all	1001	N	N		N			N	N	N	KILL
-05-long-jumps	all	99	1	N		N			N	N	N	KILL
-05-long-jumps	all	100-105	1	N		N			N	N	N	ALLOW
-05-long-jumps	all	195-199	1	N		N			N	N	N	ALLOW
-05-long-jumps	all	200	1	N		N			N	N	N	KILL
-05-long-jumps	all	3	N	N		N			N	N	N	KILL
-05-long-jumps	all	4	1	2		3			4	5	6	ALLOW
-05-long-jumps	all	5	N	N		N			N	N	N	KILL
-
-test type: bpf-sim-fuzz
-
-# Testname	StressCount
-05-long-jumps	50
diff --git a/tests/05-long-jumps.c b/tests/05-sim-long_jumps.c
index 9f24ecd..9f24ecd 100644
--- a/tests/05-long-jumps.c
+++ b/tests/05-sim-long_jumps.c
diff --git a/tests/05-long-jumps.py b/tests/05-sim-long_jumps.py
index 716f745..716f745 100755
--- a/tests/05-long-jumps.py
+++ b/tests/05-sim-long_jumps.py
diff --git a/tests/05-sim-long_jumps.tests b/tests/05-sim-long_jumps.tests
new file mode 100644
index 0000000..bbdeaa1
--- /dev/null
+++ b/tests/05-sim-long_jumps.tests
@@ -0,0 +1,32 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright IBM Corp. 2012
+# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
+#
+
+test type: bpf-sim
+
+# Testname		Arch	Syscall	Arg0	Arg1		Arg2			Arg3	Arg4	Arg5	Result
+05-sim-long_jumps	all	1	1	2		3			4	5	6	ALLOW
+05-sim-long_jumps	all	2	N	N		N			N	N	N	KILL
+05-sim-long_jumps	all	999	N	N		N			N	N	N	KILL
+05-sim-long_jumps	x86	1000	0-5 	0x856B008	0x7FFFFFFE		N	N	N	ALLOW
+05-sim-long_jumps	x86_64	1000	0-5 	0x856B008	0x7FFFFFFFFFFFFFFE	N	N	N	ALLOW
+05-sim-long_jumps	x86	1000	95-99	0x856B008	0x7FFFFFFE		N	N	N	ALLOW
+05-sim-long_jumps	x86_64	1000	95-99	0x856B008	0x7FFFFFFFFFFFFFFE	N	N	N	ALLOW
+05-sim-long_jumps	x86	1000	100	0x856B008	0x7FFFFFFE		N	N	N	KILL
+05-sim-long_jumps	x86_64	1000	100	0x856B008	0x7FFFFFFFFFFFFFFE	N	N	N	KILL
+05-sim-long_jumps	all	1001	N	N		N			N	N	N	KILL
+05-sim-long_jumps	all	99	1	N		N			N	N	N	KILL
+05-sim-long_jumps	all	100-105	1	N		N			N	N	N	ALLOW
+05-sim-long_jumps	all	195-199	1	N		N			N	N	N	ALLOW
+05-sim-long_jumps	all	200	1	N		N			N	N	N	KILL
+05-sim-long_jumps	all	3	N	N		N			N	N	N	KILL
+05-sim-long_jumps	all	4	1	2		3			4	5	6	ALLOW
+05-sim-long_jumps	all	5	N	N		N			N	N	N	KILL
+
+test type: bpf-sim-fuzz
+
+# Testname		StressCount
+05-sim-long_jumps	50
diff --git a/tests/06-actions.tests b/tests/06-actions.tests
deleted file mode 100644
index c0f5629..0000000
--- a/tests/06-actions.tests
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright IBM Corp. 2012
-# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
-#
-
-test type: bpf-sim
-
-# Testname	Arch	Syscall	Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
-06-actions	all	read	4		0x856B008	80	N	N	N	ALLOW
-06-actions	all	write	1		0x856B008	N	N	N	N	ERRNO(1)
-06-actions	all	close	4		N		N	N	N	N	TRAP
-06-actions	all	open	0x856B008	4		N	N	N	N	TRACE(1234)
-06-actions	x86	0-2	N		N		N	N	N	N	KILL
-06-actions	x86	7-350	N		N		N	N	N	N	KILL
-06-actions	x86_64	4-350	N		N		N	N	N	N	KILL
-
-test type: bpf-sim-fuzz
-
-# Testname	StressCount
-06-actions	50
diff --git a/tests/06-actions.c b/tests/06-sim-actions.c
index 9aff9ef..9aff9ef 100644
--- a/tests/06-actions.c
+++ b/tests/06-sim-actions.c
diff --git a/tests/06-actions.py b/tests/06-sim-actions.py
index 4bd76f5..4bd76f5 100755
--- a/tests/06-actions.py
+++ b/tests/06-sim-actions.py
diff --git a/tests/06-sim-actions.tests b/tests/06-sim-actions.tests
new file mode 100644
index 0000000..99d1071
--- /dev/null
+++ b/tests/06-sim-actions.tests
@@ -0,0 +1,22 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright IBM Corp. 2012
+# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
+#
+
+test type: bpf-sim
+
+# Testname	Arch	Syscall	Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
+06-sim-actions	all	read	4		0x856B008	80	N	N	N	ALLOW
+06-sim-actions	all	write	1		0x856B008	N	N	N	N	ERRNO(1)
+06-sim-actions	all	close	4		N		N	N	N	N	TRAP
+06-sim-actions	all	open	0x856B008	4		N	N	N	N	TRACE(1234)
+06-sim-actions	x86	0-2	N		N		N	N	N	N	KILL
+06-sim-actions	x86	7-350	N		N		N	N	N	N	KILL
+06-sim-actions	x86_64	4-350	N		N		N	N	N	N	KILL
+
+test type: bpf-sim-fuzz
+
+# Testname	StressCount
+06-sim-actions	50
diff --git a/tests/07-db-bug-looping.c b/tests/07-sim-db_bug_looping.c
index 53fb048..53fb048 100644
--- a/tests/07-db-bug-looping.c
+++ b/tests/07-sim-db_bug_looping.c
diff --git a/tests/07-db-bug-looping.py b/tests/07-sim-db_bug_looping.py
index 0b6e988..0b6e988 100755
--- a/tests/07-db-bug-looping.py
+++ b/tests/07-sim-db_bug_looping.py
diff --git a/tests/07-db-bug-looping.tests b/tests/07-sim-db_bug_looping.tests
index 1e654f6..f2b1b84 100644
--- a/tests/07-db-bug-looping.tests
+++ b/tests/07-sim-db_bug_looping.tests
@@ -8,11 +8,11 @@
 test type: bpf-sim
 
 # Testname		Arch	Syscall	Arg0	Arg1		Arg2	Arg3	Arg4	Arg5	Result
-07-db-bug-looping	all	read	1	0x856B008	10	N	N	N	ALLOW
-07-db-bug-looping	all	read	2-10	0		10	N	N	N	ALLOW
-07-db-bug-looping	all	read	0	0x856B008	10	N	N	N	ALLOW
+07-sim-db_bug_looping	all	read	1	0x856B008	10	N	N	N	ALLOW
+07-sim-db_bug_looping	all	read	2-10	0		10	N	N	N	ALLOW
+07-sim-db_bug_looping	all	read	0	0x856B008	10	N	N	N	ALLOW
 
 test type: bpf-sim-fuzz
 
 # Testname		StressCount
-07-db-bug-looping	50
+07-sim-db_bug_looping	50
diff --git a/tests/08-subtree-checks.c b/tests/08-sim-subtree_checks.c
index 2e6577c..2e6577c 100644
--- a/tests/08-subtree-checks.c
+++ b/tests/08-sim-subtree_checks.c
diff --git a/tests/08-subtree-checks.py b/tests/08-sim-subtree_checks.py
index 766c3d1..766c3d1 100755
--- a/tests/08-subtree-checks.py
+++ b/tests/08-sim-subtree_checks.py
diff --git a/tests/08-sim-subtree_checks.tests b/tests/08-sim-subtree_checks.tests
new file mode 100644
index 0000000..d4511bd
--- /dev/null
+++ b/tests/08-sim-subtree_checks.tests
@@ -0,0 +1,41 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright IBM Corp. 2012
+# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
+#
+
+test type: bpf-sim
+
+# Testname		Arch	Syscall	Arg0	Arg1	Arg2	Arg3	Arg4	Arg5	Result
+08-sim-subtree_checks	all	1000	0-10	1	N	N	N	N	ALLOW
+08-sim-subtree_checks	all	1000	0-10	0	N	N	N	N	KILL
+08-sim-subtree_checks	all	1001	0-10	1	N	N	N	N	ALLOW
+08-sim-subtree_checks	all	1001	0-10	0	N	N	N	N	KILL
+08-sim-subtree_checks	all	1002	0-5	1	2	0-5	N	N	ALLOW
+08-sim-subtree_checks	all	1002	0-5	2	1	0-5	N	N	KILL
+08-sim-subtree_checks	all	1003	0-5	1	2	0-5	N	N	ALLOW
+08-sim-subtree_checks	all	1003	0-5	2	1	0-5	N	N	KILL
+08-sim-subtree_checks	all	1004	0	11	5-10	10	10	1-5	ALLOW
+08-sim-subtree_checks	all	1004	0	1	2	0-5	N	N	ALLOW
+08-sim-subtree_checks	all	1004	1-5	1	2	0-5	N	N	ALLOW
+08-sim-subtree_checks	all	1004	1-5	1	2	30-35	N	N	ALLOW
+08-sim-subtree_checks	all	1004	1-5	2	1	30-35	N	N	KILL
+08-sim-subtree_checks	all	1005	0	11	5-10	10	10	1-5	ALLOW
+08-sim-subtree_checks	all	1005	0	1	2	0-5	N	N	ALLOW
+08-sim-subtree_checks	all	1005	1-5	1	2	0-5	N	N	ALLOW
+08-sim-subtree_checks	all	1005	1-5	1	2	30-35	N	N	ALLOW
+08-sim-subtree_checks	all	1005	1-5	2	1	30-35	N	N	KILL
+08-sim-subtree_checks	all	1006	0-10	1	2	N	N	N	ALLOW
+08-sim-subtree_checks	all	1006	0-10	1	3	N	N	N	KILL
+08-sim-subtree_checks	all	1006	10	2-100	2	N	N	N	ALLOW
+08-sim-subtree_checks	all	1007	0	0	1	3	N	N	TRAP
+08-sim-subtree_checks	all	1007	1	1	1	0-2	1	1	ALLOW
+08-sim-subtree_checks	all	1007	1	1	2	0-2	1	1	ALLOW
+08-sim-subtree_checks	all	1007	1	1	2	4-6	1	1	ALLOW
+08-sim-subtree_checks	all	1007	1	1	0	3	1	1	KILL
+
+test type: bpf-sim-fuzz
+
+# Testname		StressCount
+08-sim-subtree_checks	50
diff --git a/tests/08-subtree-checks.tests b/tests/08-subtree-checks.tests
deleted file mode 100644
index 9621fa7..0000000
--- a/tests/08-subtree-checks.tests
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright IBM Corp. 2012
-# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
-#
-
-test type: bpf-sim
-
-# Testname		Arch	Syscall	Arg0	Arg1	Arg2	Arg3	Arg4	Arg5	Result
-08-subtree-checks	all	1000	0-10	1	N	N	N	N	ALLOW
-08-subtree-checks	all	1000	0-10	0	N	N	N	N	KILL
-08-subtree-checks	all	1001	0-10	1	N	N	N	N	ALLOW
-08-subtree-checks	all	1001	0-10	0	N	N	N	N	KILL
-08-subtree-checks	all	1002	0-5	1	2	0-5	N	N	ALLOW
-08-subtree-checks	all	1002	0-5	2	1	0-5	N	N	KILL
-08-subtree-checks	all	1003	0-5	1	2	0-5	N	N	ALLOW
-08-subtree-checks	all	1003	0-5	2	1	0-5	N	N	KILL
-08-subtree-checks	all	1004	0	11	5-10	10	10	1-5	ALLOW
-08-subtree-checks	all	1004	0	1	2	0-5	N	N	ALLOW
-08-subtree-checks	all	1004	1-5	1	2	0-5	N	N	ALLOW
-08-subtree-checks	all	1004	1-5	1	2	30-35	N	N	ALLOW
-08-subtree-checks	all	1004	1-5	2	1	30-35	N	N	KILL
-08-subtree-checks	all	1005	0	11	5-10	10	10	1-5	ALLOW
-08-subtree-checks	all	1005	0	1	2	0-5	N	N	ALLOW
-08-subtree-checks	all	1005	1-5	1	2	0-5	N	N	ALLOW
-08-subtree-checks	all	1005	1-5	1	2	30-35	N	N	ALLOW
-08-subtree-checks	all	1005	1-5	2	1	30-35	N	N	KILL
-08-subtree-checks	all	1006	0-10	1	2	N	N	N	ALLOW
-08-subtree-checks	all	1006	0-10	1	3	N	N	N	KILL
-08-subtree-checks	all	1006	10	2-100	2	N	N	N	ALLOW
-08-subtree-checks	all	1007	0	0	1	3	N	N	TRAP
-08-subtree-checks	all	1007	1	1	1	0-2	1	1	ALLOW
-08-subtree-checks	all	1007	1	1	2	0-2	1	1	ALLOW
-08-subtree-checks	all	1007	1	1	2	4-6	1	1	ALLOW
-08-subtree-checks	all	1007	1	1	0	3	1	1	KILL
-
-test type: bpf-sim-fuzz
-
-# Testname		StressCount
-08-subtree-checks	50
diff --git a/tests/09-syscall-priority-pre.c b/tests/09-sim-syscall_priority_pre.c
index 5de45bf..5de45bf 100644
--- a/tests/09-syscall-priority-pre.c
+++ b/tests/09-sim-syscall_priority_pre.c
diff --git a/tests/09-syscall-priority-pre.py b/tests/09-sim-syscall_priority_pre.py
index 7b19943..7b19943 100755
--- a/tests/09-syscall-priority-pre.py
+++ b/tests/09-sim-syscall_priority_pre.py
diff --git a/tests/09-sim-syscall_priority_pre.tests b/tests/09-sim-syscall_priority_pre.tests
new file mode 100644
index 0000000..3e17bc4
--- /dev/null
+++ b/tests/09-sim-syscall_priority_pre.tests
@@ -0,0 +1,21 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright IBM Corp. 2012
+# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
+#
+
+test type: bpf-sim
+
+# Testname			Arch	Syscall		Arg0	Arg1	Arg2	Arg3	Arg4	Arg5	Result
+09-sim-syscall_priority_pre	all	999		N	N	N	N	N	N	KILL
+09-sim-syscall_priority_pre	all	1000-1002	0	1	N	N	N	N	ALLOW
+09-sim-syscall_priority_pre	all	1000		0	2	N	N	N	N	KILL
+09-sim-syscall_priority_pre	all	1001-1002	0	2	N	N	N	N	ALLOW
+09-sim-syscall_priority_pre	all	1000-1001	1	1	N	N	N	N	KILL
+09-sim-syscall_priority_pre	all	1003		N	N	N	N	N	N	KILL
+
+test type: bpf-sim-fuzz
+
+# Testname			StressCount
+09-sim-syscall_priority_pre	50
diff --git a/tests/09-syscall-priority-pre.tests b/tests/09-syscall-priority-pre.tests
deleted file mode 100644
index c62a771..0000000
--- a/tests/09-syscall-priority-pre.tests
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright IBM Corp. 2012
-# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
-#
-
-test type: bpf-sim
-
-# Testname		Arch	Syscall		Arg0	Arg1	Arg2	Arg3	Arg4	Arg5	Result
-09-syscall-priority-pre	all	999		N	N	N	N	N	N	KILL
-09-syscall-priority-pre	all	1000-1002	0	1	N	N	N	N	ALLOW
-09-syscall-priority-pre	all	1000		0	2	N	N	N	N	KILL
-09-syscall-priority-pre	all	1001-1002	0	2	N	N	N	N	ALLOW
-09-syscall-priority-pre	all	1000-1001	1	1	N	N	N	N	KILL
-09-syscall-priority-pre	all	1003		N	N	N	N	N	N	KILL
-
-test type: bpf-sim-fuzz
-
-# Testname		StressCount
-09-syscall-priority-pre	50
diff --git a/tests/10-syscall-priority-post.c b/tests/10-sim-syscall_priority_post.c
index bafa5dd..bafa5dd 100644
--- a/tests/10-syscall-priority-post.c
+++ b/tests/10-sim-syscall_priority_post.c
diff --git a/tests/10-syscall-priority-post.py b/tests/10-sim-syscall_priority_post.py
index bc2e152..bc2e152 100755
--- a/tests/10-syscall-priority-post.py
+++ b/tests/10-sim-syscall_priority_post.py
diff --git a/tests/10-sim-syscall_priority_post.tests b/tests/10-sim-syscall_priority_post.tests
new file mode 100644
index 0000000..6624d2d
--- /dev/null
+++ b/tests/10-sim-syscall_priority_post.tests
@@ -0,0 +1,21 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright IBM Corp. 2012
+# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
+#
+
+test type: bpf-sim
+
+# Testname			Arch	Syscall		Arg0	Arg1	Arg2	Arg3	Arg4	Arg5	Result
+10-sim-syscall_priority_post	all	999		N	N	N	N	N	N	KILL
+10-sim-syscall_priority_post	all	1000-1002	0	1	N	N	N	N	ALLOW
+10-sim-syscall_priority_post	all	1000		0	2	N	N	N	N	KILL
+10-sim-syscall_priority_post	all	1001-1002	0	2	N	N	N	N	ALLOW
+10-sim-syscall_priority_post	all	1000-1001	1	1	N	N	N	N	KILL
+10-sim-syscall_priority_post	all	1003		N	N	N	N	N	N	KILL
+
+test type: bpf-sim-fuzz
+
+# Testname			StressCount
+10-sim-syscall_priority_post	50
diff --git a/tests/10-syscall-priority-post.tests b/tests/10-syscall-priority-post.tests
deleted file mode 100644
index b2dcf5c..0000000
--- a/tests/10-syscall-priority-post.tests
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright IBM Corp. 2012
-# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
-#
-
-test type: bpf-sim
-
-# Testname			Arch	Syscall		Arg0	Arg1	Arg2	Arg3	Arg4	Arg5	Result
-10-syscall-priority-post	all	999		N	N	N	N	N	N	KILL
-10-syscall-priority-post	all	1000-1002	0	1	N	N	N	N	ALLOW
-10-syscall-priority-post	all	1000		0	2	N	N	N	N	KILL
-10-syscall-priority-post	all	1001-1002	0	2	N	N	N	N	ALLOW
-10-syscall-priority-post	all	1000-1001	1	1	N	N	N	N	KILL
-10-syscall-priority-post	all	1003		N	N	N	N	N	N	KILL
-
-test type: bpf-sim-fuzz
-
-# Testname			StressCount
-10-syscall-priority-post	50
diff --git a/tests/11-basic-errors.c b/tests/11-basic-basic_errors.c
index c328577..c328577 100644
--- a/tests/11-basic-errors.c
+++ b/tests/11-basic-basic_errors.c
diff --git a/tests/11-basic-errors.py b/tests/11-basic-basic_errors.py
index 4923e9b..4923e9b 100755
--- a/tests/11-basic-errors.py
+++ b/tests/11-basic-basic_errors.py
diff --git a/tests/11-basic-errors.tests b/tests/11-basic-basic_errors.tests
index 598d0f3..3593392 100644
--- a/tests/11-basic-errors.tests
+++ b/tests/11-basic-basic_errors.tests
@@ -8,4 +8,4 @@
 test type: basic
 
 # Test command
-11-basic-errors
+11-basic-basic_errors
diff --git a/tests/12-basic-masked-ops.tests b/tests/12-basic-masked-ops.tests
deleted file mode 100644
index 43c3177..0000000
--- a/tests/12-basic-masked-ops.tests
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright IBM Corp. 2012
-# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
-#
-
-test type: bpf-sim
-
-# Testname		Arch	Syscall	Arg0	Arg1		Arg2	Arg3	Arg4	Arg5	Result
-12-basic-masked-ops	all	1000	0	1		2	N	N	N	ALLOW
-12-basic-masked-ops	all	1000	0	0x01		2	N	N	N	ALLOW
-12-basic-masked-ops	all	1000	0	0x02-0x0A	2	N	N	N	KILL
-12-basic-masked-ops	all	1000	0	0x101		2	N	N	N	ALLOW
-12-basic-masked-ops	all	1000	0	11		2	N	N	N	ALLOW
-12-basic-masked-ops	all	1000	0	0x0B		2	N	N	N	ALLOW
-12-basic-masked-ops	all	1000	0	0x0C-0x6E	2	N	N	N	KILL
-12-basic-masked-ops	all	1000	0	0x1000B		2	N	N	N	ALLOW
-12-basic-masked-ops	all	1000	0	111		2	N	N	N	ALLOW
-12-basic-masked-ops	all	1000	0	0x6F		2	N	N	N	ALLOW
-12-basic-masked-ops	all	1000	0	0x70-0x100	2	N	N	N	KILL
-12-basic-masked-ops	all	1000	0	0x102-0x200	2	N	N	N	KILL
-12-basic-masked-ops	all	1000	0	0x10002-0x1000A	2	N	N	N	KILL
-12-basic-masked-ops	all	1000	0	0x1000C-0x1006E	2	N	N	N	KILL
-12-basic-masked-ops	all	1000	0	0x1006F		2	N	N	N	ALLOW
-12-basic-masked-ops	all	1000	0	1000		2	N	N	N	ALLOW
-12-basic-masked-ops	all	1000	0	0x3E8		2	N	N	N	ALLOW
-12-basic-masked-ops	all	1000	0	0x2FF		2	N	N	N	KILL
-12-basic-masked-ops	all	1000	0	0x300-0x3FF	2	N	N	N	ALLOW
-12-basic-masked-ops	all	1000	0	0x400		2	N	N	N	KILL
-12-basic-masked-ops	all	1000	0	0x402-0x4FF	2	N	N	N	KILL
-12-basic-masked-ops	all	1000	0	0x10300-0x103FF	2	N	N	N	ALLOW
-
-test type: bpf-sim-fuzz
-
-# Testname		StressCount
-12-basic-masked-ops	50
diff --git a/tests/12-basic-masked-ops.c b/tests/12-sim-basic_masked_ops.c
index a6fd939..a6fd939 100644
--- a/tests/12-basic-masked-ops.c
+++ b/tests/12-sim-basic_masked_ops.c
diff --git a/tests/12-basic-masked-ops.py b/tests/12-sim-basic_masked_ops.py
index 283534b..283534b 100755
--- a/tests/12-basic-masked-ops.py
+++ b/tests/12-sim-basic_masked_ops.py
diff --git a/tests/12-sim-basic_masked_ops.tests b/tests/12-sim-basic_masked_ops.tests
new file mode 100644
index 0000000..23eada2
--- /dev/null
+++ b/tests/12-sim-basic_masked_ops.tests
@@ -0,0 +1,37 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright IBM Corp. 2012
+# Author: Corey Bryant <coreyb@linux.vnet.ibm.com>
+#
+
+test type: bpf-sim
+
+# Testname		Arch	Syscall	Arg0	Arg1		Arg2	Arg3	Arg4	Arg5	Result
+12-sim-basic_masked_ops	all	1000	0	1		2	N	N	N	ALLOW
+12-sim-basic_masked_ops	all	1000	0	0x01		2	N	N	N	ALLOW
+12-sim-basic_masked_ops	all	1000	0	0x02-0x0A	2	N	N	N	KILL
+12-sim-basic_masked_ops	all	1000	0	0x101		2	N	N	N	ALLOW
+12-sim-basic_masked_ops	all	1000	0	11		2	N	N	N	ALLOW
+12-sim-basic_masked_ops	all	1000	0	0x0B		2	N	N	N	ALLOW
+12-sim-basic_masked_ops	all	1000	0	0x0C-0x6E	2	N	N	N	KILL
+12-sim-basic_masked_ops	all	1000	0	0x1000B		2	N	N	N	ALLOW
+12-sim-basic_masked_ops	all	1000	0	111		2	N	N	N	ALLOW
+12-sim-basic_masked_ops	all	1000	0	0x6F		2	N	N	N	ALLOW
+12-sim-basic_masked_ops	all	1000	0	0x70-0x100	2	N	N	N	KILL
+12-sim-basic_masked_ops	all	1000	0	0x102-0x200	2	N	N	N	KILL
+12-sim-basic_masked_ops	all	1000	0	0x10002-0x1000A	2	N	N	N	KILL
+12-sim-basic_masked_ops	all	1000	0	0x1000C-0x1006E	2	N	N	N	KILL
+12-sim-basic_masked_ops	all	1000	0	0x1006F		2	N	N	N	ALLOW
+12-sim-basic_masked_ops	all	1000	0	1000		2	N	N	N	ALLOW
+12-sim-basic_masked_ops	all	1000	0	0x3E8		2	N	N	N	ALLOW
+12-sim-basic_masked_ops	all	1000	0	0x2FF		2	N	N	N	KILL
+12-sim-basic_masked_ops	all	1000	0	0x300-0x3FF	2	N	N	N	ALLOW
+12-sim-basic_masked_ops	all	1000	0	0x400		2	N	N	N	KILL
+12-sim-basic_masked_ops	all	1000	0	0x402-0x4FF	2	N	N	N	KILL
+12-sim-basic_masked_ops	all	1000	0	0x10300-0x103FF	2	N	N	N	ALLOW
+
+test type: bpf-sim-fuzz
+
+# Testname		StressCount
+12-sim-basic_masked_ops	50
diff --git a/tests/13-attrs.c b/tests/13-basic-attrs.c
index 46518a5..46518a5 100644
--- a/tests/13-attrs.c
+++ b/tests/13-basic-attrs.c
diff --git a/tests/13-attrs.py b/tests/13-basic-attrs.py
index 471ab34..471ab34 100755
--- a/tests/13-attrs.py
+++ b/tests/13-basic-attrs.py
diff --git a/tests/13-attrs.tests b/tests/13-basic-attrs.tests
index 964b81d..2288787 100644
--- a/tests/13-attrs.tests
+++ b/tests/13-basic-attrs.tests
@@ -8,4 +8,4 @@
 test type: basic
 
 # Test command
-13-attrs
+13-basic-attrs
diff --git a/tests/14-reset.tests b/tests/14-reset.tests
deleted file mode 100644
index a5c505f..0000000
--- a/tests/14-reset.tests
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright (c) 2012 Red Hat <pmoore@redhat.com>
-# Author: Paul Moore <pmoore@redhat.com
-#
-
-test type: bpf-sim
-
-# Testname	Arch	Syscall		Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
-14-reset	all	read		0		0x856B008	40	N	N	N	KILL
-14-reset	all	write		1		0x856B008	40	N	N	N	ALLOW
-14-reset	all	close		4		N		N	N	N	N	KILL
-14-reset	all	rt_sigreturn	N		N		N	N	N	N	KILL
-14-reset	all	open		0x856B008	4		N	N	N	N	KILL
-14-reset	x86	0-3		N		N		N	N	N	N	KILL
-14-reset	x86	5-360		N		N		N	N	N	N	KILL
-14-reset	x86_64	0		N		N		N	N	N	N	KILL
-14-reset	x86_64	2-360		N		N		N	N	N	N	KILL
-
-test type: bpf-sim-fuzz
-
-# Testname	StressCount
-14-reset	50
diff --git a/tests/14-reset.c b/tests/14-sim-reset.c
index adcc934..adcc934 100644
--- a/tests/14-reset.c
+++ b/tests/14-sim-reset.c
diff --git a/tests/14-reset.py b/tests/14-sim-reset.py
index 60c131f..60c131f 100755
--- a/tests/14-reset.py
+++ b/tests/14-sim-reset.py
diff --git a/tests/14-sim-reset.tests b/tests/14-sim-reset.tests
new file mode 100644
index 0000000..4c42e3f
--- /dev/null
+++ b/tests/14-sim-reset.tests
@@ -0,0 +1,24 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright (c) 2012 Red Hat <pmoore@redhat.com>
+# Author: Paul Moore <pmoore@redhat.com
+#
+
+test type: bpf-sim
+
+# Testname	Arch	Syscall		Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
+14-sim-reset	all	read		0		0x856B008	40	N	N	N	KILL
+14-sim-reset	all	write		1		0x856B008	40	N	N	N	ALLOW
+14-sim-reset	all	close		4		N		N	N	N	N	KILL
+14-sim-reset	all	rt_sigreturn	N		N		N	N	N	N	KILL
+14-sim-reset	all	open		0x856B008	4		N	N	N	N	KILL
+14-sim-reset	x86	0-3		N		N		N	N	N	N	KILL
+14-sim-reset	x86	5-360		N		N		N	N	N	N	KILL
+14-sim-reset	x86_64	0		N		N		N	N	N	N	KILL
+14-sim-reset	x86_64	2-360		N		N		N	N	N	N	KILL
+
+test type: bpf-sim-fuzz
+
+# Testname	StressCount
+14-sim-reset	50
diff --git a/tests/15-resolver.c b/tests/15-basic-resolver.c
index a103a1a..a103a1a 100644
--- a/tests/15-resolver.c
+++ b/tests/15-basic-resolver.c
diff --git a/tests/15-resolver.py b/tests/15-basic-resolver.py
index a724d1b..a724d1b 100755
--- a/tests/15-resolver.py
+++ b/tests/15-basic-resolver.py
diff --git a/tests/15-resolver.tests b/tests/15-basic-resolver.tests
index 8a8f1ad..7e4e7ba 100644
--- a/tests/15-resolver.tests
+++ b/tests/15-basic-resolver.tests
@@ -8,4 +8,4 @@
 test type: basic
 
 # Test command
-15-resolver
+15-basic-resolver
diff --git a/tests/16-arch-basic.tests b/tests/16-arch-basic.tests
deleted file mode 100644
index 5dd70bc..0000000
--- a/tests/16-arch-basic.tests
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright (c) 2012 Red Hat <pmoore@redhat.com>
-# Author: Paul Moore <pmoore@redhat.com>
-#
-
-test type: bpf-sim
-
-# Testname	Arch	Syscall		Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
-16-arch-basic	+all	read		0		0x856B008	10	N	N	N	ALLOW
-16-arch-basic	+all	read		1-10		0x856B008	10	N	N	N	KILL
-16-arch-basic	+all	write		1-2		0x856B008	10	N	N	N	ALLOW
-16-arch-basic	+all	write		3-10		0x856B008	10	N	N	N	KILL
-16-arch-basic	+all	close		N		N		N	N	N	N	ALLOW
-16-arch-basic	+all	open		0x856B008	4		N	N	N	N	KILL
-16-arch-basic	+x86	socket		1		N		N	N	N	N	ALLOW
-16-arch-basic	+x86	connect		3		N		N	N	N	N	ALLOW
-16-arch-basic	+x86	shutdown	13		N		N	N	N	N	ALLOW
-16-arch-basic	+x86_64	socket		0		1		2	N	N	N	ALLOW
-16-arch-basic	+x86_64	connect		0		1		2	N	N	N	ALLOW
-16-arch-basic	+x86_64	shutdown	0		1		2	N	N	N	ALLOW
-
-test type: bpf-sim-fuzz
-
-# Testname	StressCount
-16-arch-basic	50
diff --git a/tests/16-arch-basic.c b/tests/16-sim-arch_basic.c
index f2d122c..f2d122c 100644
--- a/tests/16-arch-basic.c
+++ b/tests/16-sim-arch_basic.c
diff --git a/tests/16-arch-basic.py b/tests/16-sim-arch_basic.py
index e23d18b..e23d18b 100755
--- a/tests/16-arch-basic.py
+++ b/tests/16-sim-arch_basic.py
diff --git a/tests/16-sim-arch_basic.tests b/tests/16-sim-arch_basic.tests
new file mode 100644
index 0000000..80bd705
--- /dev/null
+++ b/tests/16-sim-arch_basic.tests
@@ -0,0 +1,27 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright (c) 2012 Red Hat <pmoore@redhat.com>
+# Author: Paul Moore <pmoore@redhat.com>
+#
+
+test type: bpf-sim
+
+# Testname		Arch	Syscall		Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
+16-sim-arch_basic	+all	read		0		0x856B008	10	N	N	N	ALLOW
+16-sim-arch_basic	+all	read		1-10		0x856B008	10	N	N	N	KILL
+16-sim-arch_basic	+all	write		1-2		0x856B008	10	N	N	N	ALLOW
+16-sim-arch_basic	+all	write		3-10		0x856B008	10	N	N	N	KILL
+16-sim-arch_basic	+all	close		N		N		N	N	N	N	ALLOW
+16-sim-arch_basic	+all	open		0x856B008	4		N	N	N	N	KILL
+16-sim-arch_basic	+x86	socket		1		N		N	N	N	N	ALLOW
+16-sim-arch_basic	+x86	connect		3		N		N	N	N	N	ALLOW
+16-sim-arch_basic	+x86	shutdown	13		N		N	N	N	N	ALLOW
+16-sim-arch_basic	+x86_64	socket		0		1		2	N	N	N	ALLOW
+16-sim-arch_basic	+x86_64	connect		0		1		2	N	N	N	ALLOW
+16-sim-arch_basic	+x86_64	shutdown	0		1		2	N	N	N	ALLOW
+
+test type: bpf-sim-fuzz
+
+# Testname		StressCount
+16-sim-arch_basic	50
diff --git a/tests/17-arch-merge.tests b/tests/17-arch-merge.tests
deleted file mode 100644
index b60d39b..0000000
--- a/tests/17-arch-merge.tests
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright (c) 2012 Red Hat <pmoore@redhat.com>
-# Author: Paul Moore <pmoore@redhat.com>
-#
-
-test type: bpf-sim
-
-# Testname	Arch	Syscall		Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
-17-arch-merge	+x86	read		0		0x856B008	10	N	N	N	ALLOW
-17-arch-merge	+x86	read		1-10		0x856B008	10	N	N	N	KILL
-17-arch-merge	+x86	write		1-2		0x856B008	10	N	N	N	ALLOW
-17-arch-merge	+x86	write		3-10		0x856B008	10	N	N	N	KILL
-17-arch-merge	+x86	close		N		N		N	N	N	N	ALLOW
-17-arch-merge	+x86	open		0x856B008	4		N	N	N	N	KILL
-17-arch-merge	+x86_64	socket		0		1		2	N	N	N	ALLOW
-17-arch-merge	+x86_64	connect		0		1		2	N	N	N	ALLOW
-17-arch-merge	+x86_64	shutdown	0		1		2	N	N	N	ALLOW
-
-test type: bpf-sim-fuzz
-
-# Testname	StressCount
-17-arch-merge	50
diff --git a/tests/17-arch-merge.c b/tests/17-sim-arch_merge.c
index 61e1490..61e1490 100644
--- a/tests/17-arch-merge.c
+++ b/tests/17-sim-arch_merge.c
diff --git a/tests/17-arch-merge.py b/tests/17-sim-arch_merge.py
index 0221764..0221764 100755
--- a/tests/17-arch-merge.py
+++ b/tests/17-sim-arch_merge.py
diff --git a/tests/17-sim-arch_merge.tests b/tests/17-sim-arch_merge.tests
new file mode 100644
index 0000000..c32f5fe
--- /dev/null
+++ b/tests/17-sim-arch_merge.tests
@@ -0,0 +1,24 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright (c) 2012 Red Hat <pmoore@redhat.com>
+# Author: Paul Moore <pmoore@redhat.com>
+#
+
+test type: bpf-sim
+
+# Testname		Arch	Syscall		Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
+17-sim-arch_merge	+x86	read		0		0x856B008	10	N	N	N	ALLOW
+17-sim-arch_merge	+x86	read		1-10		0x856B008	10	N	N	N	KILL
+17-sim-arch_merge	+x86	write		1-2		0x856B008	10	N	N	N	ALLOW
+17-sim-arch_merge	+x86	write		3-10		0x856B008	10	N	N	N	KILL
+17-sim-arch_merge	+x86	close		N		N		N	N	N	N	ALLOW
+17-sim-arch_merge	+x86	open		0x856B008	4		N	N	N	N	KILL
+17-sim-arch_merge	+x86_64	socket		0		1		2	N	N	N	ALLOW
+17-sim-arch_merge	+x86_64	connect		0		1		2	N	N	N	ALLOW
+17-sim-arch_merge	+x86_64	shutdown	0		1		2	N	N	N	ALLOW
+
+test type: bpf-sim-fuzz
+
+# Testname		StressCount
+17-sim-arch_merge	50
diff --git a/tests/18-basic-whitelist.tests b/tests/18-basic-whitelist.tests
deleted file mode 100644
index 775a64c..0000000
--- a/tests/18-basic-whitelist.tests
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# libseccomp regression test automation data
-#
-# Copyright (c) 2013 Red Hat <pmoore@redhat.com>
-# Author: Paul Moore <pmoore@redhat.com>
-#
-
-test type: bpf-sim
-
-# Testname		Arch	Syscall		Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
-18-basic-whitelist	all	read		0		0x856B008	10	N	N	N	KILL
-18-basic-whitelist	all	read		1-10		0x856B008	10	N	N	N	ALLOW
-18-basic-whitelist	all	write		1-2		0x856B008	10	N	N	N	KILL
-18-basic-whitelist	all	write		3-10		0x856B008	10	N	N	N	ALLOW
-18-basic-whitelist	all	close		N		N		N	N	N	N	KILL
-18-basic-whitelist	all	rt_sigreturn	N		N		N	N	N	N	KILL
-18-basic-whitelist	all	open		0x856B008	4		N	N	N	N	ALLOW
-18-basic-whitelist	x86	0-2		N		N		N	N	N	N	ALLOW
-18-basic-whitelist	x86	7-172		N		N		N	N	N	N	ALLOW
-18-basic-whitelist	x86	174-350		N		N		N	N	N	N	ALLOW
-18-basic-whitelist	x86_64	4-14		N		N		N	N	N	N	ALLOW
-18-basic-whitelist	x86_64	16-350		N		N		N	N	N	N	ALLOW
-
-test type: bpf-sim-fuzz
-
-# Testname		StressCount
-18-basic-whitelist	50
diff --git a/tests/18-basic-whitelist.c b/tests/18-sim-basic_whitelist.c
index 5deefe7..5deefe7 100644
--- a/tests/18-basic-whitelist.c
+++ b/tests/18-sim-basic_whitelist.c
diff --git a/tests/18-basic-whitelist.py b/tests/18-sim-basic_whitelist.py
index a7b9cb7..a7b9cb7 100755
--- a/tests/18-basic-whitelist.py
+++ b/tests/18-sim-basic_whitelist.py
diff --git a/tests/18-sim-basic_whitelist.tests b/tests/18-sim-basic_whitelist.tests
new file mode 100644
index 0000000..2669ec4
--- /dev/null
+++ b/tests/18-sim-basic_whitelist.tests
@@ -0,0 +1,27 @@
+#
+# libseccomp regression test automation data
+#
+# Copyright (c) 2013 Red Hat <pmoore@redhat.com>
+# Author: Paul Moore <pmoore@redhat.com>
+#
+
+test type: bpf-sim
+
+# Testname		Arch	Syscall		Arg0		Arg1		Arg2	Arg3	Arg4	Arg5	Result
+18-sim-basic_whitelist	all	read		0		0x856B008	10	N	N	N	KILL
+18-sim-basic_whitelist	all	read		1-10		0x856B008	10	N	N	N	ALLOW
+18-sim-basic_whitelist	all	write		1-2		0x856B008	10	N	N	N	KILL
+18-sim-basic_whitelist	all	write		3-10		0x856B008	10	N	N	N	ALLOW
+18-sim-basic_whitelist	all	close		N		N		N	N	N	N	KILL
+18-sim-basic_whitelist	all	rt_sigreturn	N		N		N	N	N	N	KILL
+18-sim-basic_whitelist	all	open		0x856B008	4		N	N	N	N	ALLOW
+18-sim-basic_whitelist	x86	0-2		N		N		N	N	N	N	ALLOW
+18-sim-basic_whitelist	x86	7-172		N		N		N	N	N	N	ALLOW
+18-sim-basic_whitelist	x86	174-350		N		N		N	N	N	N	ALLOW
+18-sim-basic_whitelist	x86_64	4-14		N		N		N	N	N	N	ALLOW
+18-sim-basic_whitelist	x86_64	16-350		N		N		N	N	N	N	ALLOW
+
+test type: bpf-sim-fuzz
+
+# Testname		StressCount
+18-sim-basic_whitelist	50
diff --git a/tests/19-missing-syscalls.c b/tests/19-sim-missing_syscalls.c
index 0ccb0f5..0ccb0f5 100644
--- a/tests/19-missing-syscalls.c
+++ b/tests/19-sim-missing_syscalls.c
diff --git a/tests/19-missing-syscalls.py b/tests/19-sim-missing_syscalls.py
index 38408b1..38408b1 100755
--- a/tests/19-missing-syscalls.py
+++ b/tests/19-sim-missing_syscalls.py
diff --git a/tests/19-missing-syscalls.tests b/tests/19-sim-missing_syscalls.tests
index 7b34f0d..113fc66 100644
--- a/tests/19-missing-syscalls.tests
+++ b/tests/19-sim-missing_syscalls.tests
@@ -8,9 +8,9 @@
 test type: bpf-sim
 
 # Testname		Arch	Syscall		Arg0	Arg1	Arg2	Arg3	Arg4	Arg5	Result
-19-missing-syscalls	+x86	0-350		N	N	N	N	N	N	KILL
+19-sim-missing_syscalls	+x86	0-350		N	N	N	N	N	N	KILL
 
 test type: bpf-sim-fuzz
 
 # Testname		StressCount
-19-missing-syscalls	50
+19-sim-missing_syscalls	50
diff --git a/tests/Makefile b/tests/Makefile
index 98b5fe4..d3f76f6 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -36,25 +36,25 @@ OBJS = util.o
 
 LDFLAGS := ../src/libseccomp.a $(OBJS)
 
-TESTS = 01-allow \
-	02-basic \
-	03-basic-chains \
-	04-multilevel-chains \
-	05-long-jumps \
-	06-actions \
-	07-db-bug-looping \
-	08-subtree-checks \
-	09-syscall-priority-pre \
-	10-syscall-priority-post \
-	11-basic-errors \
-	12-basic-masked-ops \
-	13-attrs \
-	14-reset \
-	15-resolver \
-	16-arch-basic \
-	17-arch-merge \
-	18-basic-whitelist \
-	19-missing-syscalls
+TESTS = 01-sim-allow \
+	02-sim-basic \
+	03-sim-basic_chains \
+	04-sim-multilevel_chains \
+	05-sim-long_jumps \
+	06-sim-actions \
+	07-sim-db_bug_looping \
+	08-sim-subtree_checks \
+	09-sim-syscall_priority_pre \
+	10-sim-syscall_priority_post \
+	11-basic-basic_errors \
+	12-sim-basic_masked_ops \
+	13-basic-attrs \
+	14-sim-reset \
+	15-basic-resolver \
+	16-sim-arch_basic \
+	17-sim-arch_merge \
+	18-sim-basic_whitelist \
+	19-sim-missing_syscalls
 
 DEPS_OBJS = $(OBJS:%.o=%.d)
 DEPS_TESTS = $(TESTS:%=%.d)