diff --git a/external/bpf_conformance b/external/bpf_conformance
index 13de786ef..a309ef6d3 160000
--- a/external/bpf_conformance
+++ b/external/bpf_conformance
@@ -1 +1 @@
-Subproject commit 13de786efe55fb9c456561cf3ca1de4f51f590de
+Subproject commit a309ef6d384e4395e5315e19c17b47b94fa96672
diff --git a/src/test/test_conformance.cpp b/src/test/test_conformance.cpp
index c7a681cfb..ac7a308c3 100644
--- a/src/test/test_conformance.cpp
+++ b/src/test/test_conformance.cpp
@@ -87,6 +87,7 @@ TEST_CONFORMANCE("div64-negative-reg.data")
 TEST_CONFORMANCE("div64-reg.data")
 TEST_CONFORMANCE("exit-not-last.data")
 TEST_CONFORMANCE("exit.data")
+TEST_CONFORMANCE("ja32.data")
 TEST_CONFORMANCE("jeq-imm.data")
 TEST_CONFORMANCE("jeq-reg.data")
 TEST_CONFORMANCE("jeq32-imm.data")
@@ -184,6 +185,16 @@ TEST_CONFORMANCE("mod64-by-zero-reg.data")
 TEST_CONFORMANCE("mod64.data")
 TEST_CONFORMANCE("mov.data")
 TEST_CONFORMANCE("mov64-sign-extend.data")
+TEST_CONFORMANCE("movsx1632-imm.data")
+TEST_CONFORMANCE("movsx1632-reg.data")
+TEST_CONFORMANCE("movsx1664-imm.data")
+TEST_CONFORMANCE("movsx1664-reg.data")
+TEST_CONFORMANCE("movsx3264-imm.data")
+TEST_CONFORMANCE("movsx3264-reg.data")
+TEST_CONFORMANCE("movsx832-imm.data")
+TEST_CONFORMANCE("movsx832-reg.data")
+TEST_CONFORMANCE("movsx864-imm.data")
+TEST_CONFORMANCE("movsx864-reg.data")
 TEST_CONFORMANCE("mul32-imm.data")
 TEST_CONFORMANCE("mul32-reg-overflow.data")
 TEST_CONFORMANCE("mul32-reg.data")
@@ -204,12 +215,30 @@ TEST_CONFORMANCE("rsh64-imm-neg.data")
 TEST_CONFORMANCE("rsh64-reg.data")
 TEST_CONFORMANCE("rsh64-reg-high.data")
 TEST_CONFORMANCE("rsh64-reg-neg.data")
+TEST_CONFORMANCE("sdiv32-by-zero-imm.data")
 TEST_CONFORMANCE("sdiv32-by-zero-reg.data")
 TEST_CONFORMANCE("sdiv32-imm.data")
 TEST_CONFORMANCE("sdiv32-reg.data")
+TEST_CONFORMANCE("sdiv64-by-zero-imm.data")
 TEST_CONFORMANCE("sdiv64-by-zero-reg.data")
 TEST_CONFORMANCE("sdiv64-imm.data")
 TEST_CONFORMANCE("sdiv64-reg.data")
+TEST_CONFORMANCE("smod32-neg-by-neg-imm.data")
+TEST_CONFORMANCE("smod32-neg-by-neg-reg.data")
+TEST_CONFORMANCE("smod32-neg-by-pos-imm.data")
+TEST_CONFORMANCE("smod32-neg-by-pos-reg.data")
+TEST_CONFORMANCE("smod32-neg-by-zero-imm.data")
+TEST_CONFORMANCE("smod32-neg-by-zero-reg.data")
+TEST_CONFORMANCE("smod32-pos-by-neg-imm.data")
+TEST_CONFORMANCE("smod32-pos-by-neg-reg.data")
+TEST_CONFORMANCE("smod64-neg-by-neg-imm.data")
+TEST_CONFORMANCE("smod64-neg-by-neg-reg.data")
+TEST_CONFORMANCE("smod64-neg-by-pos-imm.data")
+TEST_CONFORMANCE("smod64-neg-by-pos-reg.data")
+TEST_CONFORMANCE("smod64-neg-by-zero-imm.data")
+TEST_CONFORMANCE("smod64-neg-by-zero-reg.data")
+TEST_CONFORMANCE("smod64-pos-by-neg-imm.data")
+TEST_CONFORMANCE("smod64-pos-by-neg-reg.data")
 TEST_CONFORMANCE("stack.data")
 TEST_CONFORMANCE("stb.data")
 TEST_CONFORMANCE("stdw.data")
@@ -222,4 +251,7 @@ TEST_CONFORMANCE("stxb.data")
 TEST_CONFORMANCE("stxdw.data")
 TEST_CONFORMANCE("stxh.data")
 TEST_CONFORMANCE("stxw.data")
+TEST_CONFORMANCE("swap16.data")
+TEST_CONFORMANCE("swap32.data")
+TEST_CONFORMANCE("swap64.data")
 TEST_CONFORMANCE("subnet.data")