diff --git a/evmcc/test/jump/badindirect1.evm b/evmcc/test/jump/badindirect1.evm
new file mode 100644
index 000000000..b2a8aad67
--- /dev/null
+++ b/evmcc/test/jump/badindirect1.evm
@@ -0,0 +1 @@
+601b602502585d
diff --git a/evmcc/test/jump/badindirect1.lll b/evmcc/test/jump/badindirect1.lll
new file mode 100644
index 000000000..d6291be68
--- /dev/null
+++ b/evmcc/test/jump/badindirect1.lll
@@ -0,0 +1,9 @@
+;; Indirect jump out of code
+
+(asm
+27
+37
+MUL
+JUMP
+JUMPDEST
+)
\ No newline at end of file
diff --git a/evmcc/test/jump/badindirect2.evm b/evmcc/test/jump/badindirect2.evm
new file mode 100644
index 000000000..22217523d
--- /dev/null
+++ b/evmcc/test/jump/badindirect2.evm
@@ -0,0 +1 @@
+60016003600302596000600058
diff --git a/evmcc/test/jump/badindirect2.lll b/evmcc/test/jump/badindirect2.lll
new file mode 100644
index 000000000..53a6294f7
--- /dev/null
+++ b/evmcc/test/jump/badindirect2.lll
@@ -0,0 +1,12 @@
+;; Indirect jump into data
+
+(asm
+1          ;; 0
+3         
+3 
+MUL        ;; 6
+JUMPI      ;; 7
+0          ;; 8
+0          
+JUMP       
+)
\ No newline at end of file
diff --git a/evmcc/test/jump/badjump1.evm b/evmcc/test/jump/badjump1.evm
index b2a8aad67..5c11a8661 100644
--- a/evmcc/test/jump/badjump1.evm
+++ b/evmcc/test/jump/badjump1.evm
@@ -1 +1 @@
-601b602502585d
+6103e758
diff --git a/evmcc/test/jump/badjump1.lll b/evmcc/test/jump/badjump1.lll
index c3f9f8d69..1834a62ef 100644
--- a/evmcc/test/jump/badjump1.lll
+++ b/evmcc/test/jump/badjump1.lll
@@ -1,9 +1,6 @@
-;; Bad indirect jump. Should go to BadJumpBlock.
+;; Direct jump out of code.
 
 (asm
-27
-37
-MUL
+999
 JUMP
-JUMPDEST
 )
\ No newline at end of file
diff --git a/evmcc/test/jump/badjump2.evm b/evmcc/test/jump/badjump2.evm
new file mode 100644
index 000000000..900a1c15a
--- /dev/null
+++ b/evmcc/test/jump/badjump2.evm
@@ -0,0 +1 @@
+6004586000600058
diff --git a/evmcc/test/jump/badjump2.lll b/evmcc/test/jump/badjump2.lll
new file mode 100644
index 000000000..ce61276d7
--- /dev/null
+++ b/evmcc/test/jump/badjump2.lll
@@ -0,0 +1,9 @@
+;; Direct jump into data
+
+(asm
+4      ;; 0   0-3
+JUMP   ;; 2
+0      ;; 3   3-4
+0      ;; 5   4-7
+JUMP   ;; 6
+)
\ No newline at end of file
diff --git a/evmcc/test/jump/indirect2.lll b/evmcc/test/jump/indirect2.lll
index 9a4db8c14..f2f068630 100644
--- a/evmcc/test/jump/indirect2.lll
+++ b/evmcc/test/jump/indirect2.lll
@@ -4,14 +4,14 @@
 8	 ;; 0
 6    	 ;; 2
 ADD  	 ;; 4
-JUMP 	 ;; 5
+JUMP 	 ;; 5 --> 14
 STOP   	 ;; 6
 JUMPDEST ;; 7
 1        ;; 8
 0        ;; 10
 MSTORE   ;; 12
 STOP     ;; 13
-JUMPDEST ;; 14
+JUMPDEST ;; 14 
 2
 0
 MSTORE
diff --git a/evmcc/test/jump/indirect3.evm b/evmcc/test/jump/indirect3.evm
new file mode 100644
index 000000000..1fb0a356c
--- /dev/null
+++ b/evmcc/test/jump/indirect3.evm
@@ -0,0 +1 @@
+6001600460050159005d6001600054
diff --git a/evmcc/test/jump/indirect3.lll b/evmcc/test/jump/indirect3.lll
new file mode 100644
index 000000000..d6a679f9a
--- /dev/null
+++ b/evmcc/test/jump/indirect3.lll
@@ -0,0 +1,14 @@
+;; Indirect JUMP
+
+(asm 
+1        ;; 0
+4	 ;; 2
+5    	 ;; 4
+ADD  	 ;; 6
+JUMPI 	 ;; 7
+STOP   	 ;; 8
+JUMPDEST ;; 9
+1
+0
+MSTORE
+)
\ No newline at end of file
diff --git a/evmcc/test/jump/indirect4.evm b/evmcc/test/jump/indirect4.evm
new file mode 100644
index 000000000..f0e31a8f4
--- /dev/null
+++ b/evmcc/test/jump/indirect4.evm
@@ -0,0 +1 @@
+60006007600501596001600054005d00
diff --git a/evmcc/test/jump/indirect4.lll b/evmcc/test/jump/indirect4.lll
new file mode 100644
index 000000000..7fbe0b833
--- /dev/null
+++ b/evmcc/test/jump/indirect4.lll
@@ -0,0 +1,15 @@
+;; Indirect JUMP
+
+(asm 
+0        ;; 0
+7	 ;; 2
+5    	 ;; 4
+ADD  	 ;; 6
+JUMPI 	 ;; 7
+1        ;; 8
+0        ;; 9
+MSTORE   ;; 10
+STOP   	 ;; 11
+JUMPDEST ;; 12
+STOP
+)
\ No newline at end of file