diff --git a/tests/tests/regression_tests.rs b/tests/tests/regression_tests.rs
index 244f6bdda..933a8b9e0 100644
--- a/tests/tests/regression_tests.rs
+++ b/tests/tests/regression_tests.rs
@@ -376,7 +376,7 @@ swf_tests! {
     (as3_movieclip_displayevents_constructframegoto, "avm2/movieclip_displayevents_constructframegoto", 12),
     (as3_movieclip_displayevents_constructframeplay, "avm2/movieclip_displayevents_constructframeplay", 6),
     (as3_movieclip_displayevents_dblhandler, "avm2/movieclip_displayevents_dblhandler", 4),
-    (as3_movieclip_displayevents_enterframegoto, "avm2/movieclip_displayevents_enterframegoto", 12),
+    (as3_movieclip_displayevents_enterframegoto, "avm2/movieclip_displayevents_enterframegoto", 15),
     (as3_movieclip_displayevents_enterframeplay, "avm2/movieclip_displayevents_enterframeplay", 6),
     (as3_movieclip_displayevents_exitframegoto, "avm2/movieclip_displayevents_exitframegoto", 12),
     (as3_movieclip_displayevents_exitframeplay, "avm2/movieclip_displayevents_exitframeplay", 6),
diff --git a/tests/tests/swfs/avm2/movieclip_displayevents_constructframegoto/MainTimeline.as b/tests/tests/swfs/avm2/movieclip_displayevents_constructframegoto/MainTimeline.as
index 565f77f87..ee14e7bf3 100644
--- a/tests/tests/swfs/avm2/movieclip_displayevents_constructframegoto/MainTimeline.as
+++ b/tests/tests/swfs/avm2/movieclip_displayevents_constructframegoto/MainTimeline.as
@@ -47,6 +47,14 @@
 				case 13:
 					trace("/// (gotoAndStop(2) in frameConstructed...)");
 					this.gotoAndStop(2);
+					break;
+				case 15:
+					trace("/// (gotoAndPlay(1) in frameConstructed...)");
+					this.gotoAndPlay(1);
+					break;
+				case 17:
+					trace("/// (gotoAndPlay(3) in frameConstructed...)");
+					this.gotoAndPlay(3);
 					this.destroy_me = true;
 					break;
 			}
diff --git a/tests/tests/swfs/avm2/movieclip_displayevents_constructframegoto/output.txt b/tests/tests/swfs/avm2/movieclip_displayevents_constructframegoto/output.txt
index 304705a4e..1d2130cb1 100644
--- a/tests/tests/swfs/avm2/movieclip_displayevents_constructframegoto/output.txt
+++ b/tests/tests/swfs/avm2/movieclip_displayevents_constructframegoto/output.txt
@@ -108,3 +108,33 @@ root1 (frame 2):[Event type="exitFrame" bubbles=false cancelable=false eventPhas
 ///Children: symbol_b 
 root1 (frame 2):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
 ///Children: symbol_b 
+root1 (frame 2):[Event type="enterFrame" bubbles=false cancelable=false eventPhase=2]
+root1 (frame 2):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
+/// (gotoAndPlay(1) in frameConstructed...)
+root1 (frame 1):[Event type="removed" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 1):[Event type="added" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 1):[Event type="added" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 1):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_a 
+//MainTimeline frame 1
+// symbol_a frame 1
+root1 (frame 1):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_a 
+///Children: symbol_a 
+root1 (frame 1):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_a 
+root1 (frame 1):[Event type="removed" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 2):[Event type="enterFrame" bubbles=false cancelable=false eventPhase=2]
+root1 (frame 2):[Event type="added" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 2):[Event type="added" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 2):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
+/// (gotoAndPlay(3) in frameConstructed...)
+root1 (frame 3):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_b 
+//MainTimeline frame 3
+// symbol_b frame 1
+root1 (frame 3):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_b 
+///Children: symbol_b 
+root1 (frame 3):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_b 
diff --git a/tests/tests/swfs/avm2/movieclip_displayevents_constructframegoto/test.swf b/tests/tests/swfs/avm2/movieclip_displayevents_constructframegoto/test.swf
index 8aa230ece..9d4fa1a34 100644
Binary files a/tests/tests/swfs/avm2/movieclip_displayevents_constructframegoto/test.swf and b/tests/tests/swfs/avm2/movieclip_displayevents_constructframegoto/test.swf differ
diff --git a/tests/tests/swfs/avm2/movieclip_displayevents_enterframegoto/MainTimeline.as b/tests/tests/swfs/avm2/movieclip_displayevents_enterframegoto/MainTimeline.as
index a9a5c829d..d0052922a 100644
--- a/tests/tests/swfs/avm2/movieclip_displayevents_enterframegoto/MainTimeline.as
+++ b/tests/tests/swfs/avm2/movieclip_displayevents_enterframegoto/MainTimeline.as
@@ -45,6 +45,14 @@
 				case 10:
 					trace("/// (gotoAndStop(2) in enterFrame...)");
 					this.gotoAndStop(2);
+					break;
+				case 12:
+					trace("/// (gotoAndPlay(1) in enterFrame...)");
+					this.gotoAndPlay(1);
+					break;
+				case 13:
+					trace("/// (gotoAndPlay(3) in enterFrame...)");
+					this.gotoAndPlay(3);
 					this.destroy_me = true;
 					break;
 			}
diff --git a/tests/tests/swfs/avm2/movieclip_displayevents_enterframegoto/output.txt b/tests/tests/swfs/avm2/movieclip_displayevents_enterframegoto/output.txt
index da2d24042..d898b008c 100644
--- a/tests/tests/swfs/avm2/movieclip_displayevents_enterframegoto/output.txt
+++ b/tests/tests/swfs/avm2/movieclip_displayevents_enterframegoto/output.txt
@@ -114,3 +114,36 @@ root1 (frame 2):[Event type="exitFrame" bubbles=false cancelable=false eventPhas
 root1 (frame 2):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
 root1 (frame 2):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
 ///Children: symbol_b 
+root1 (frame 2):[Event type="enterFrame" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_b 
+root1 (frame 2):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
+root1 (frame 2):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_b 
+root1 (frame 2):[Event type="enterFrame" bubbles=false cancelable=false eventPhase=2]
+/// (gotoAndPlay(1) in enterFrame...)
+root1 (frame 1):[Event type="removed" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 1):[Event type="added" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 1):[Event type="added" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 1):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
+//MainTimeline frame 1
+// symbol_a frame 1
+root1 (frame 1):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_a 
+///Children: symbol_a 
+root1 (frame 1):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
+root1 (frame 1):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_a 
+root1 (frame 1):[Event type="removed" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 2):[Event type="enterFrame" bubbles=false cancelable=false eventPhase=2]
+/// (gotoAndPlay(3) in enterFrame...)
+root1 (frame 3):[Event type="added" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 3):[Event type="added" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 3):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
+//MainTimeline frame 3
+// symbol_b frame 1
+root1 (frame 3):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_b 
+///Children: symbol_b 
+root1 (frame 3):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
+root1 (frame 3):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_b 
diff --git a/tests/tests/swfs/avm2/movieclip_displayevents_enterframegoto/test.swf b/tests/tests/swfs/avm2/movieclip_displayevents_enterframegoto/test.swf
index d5fe40f78..1b85aca0c 100644
Binary files a/tests/tests/swfs/avm2/movieclip_displayevents_enterframegoto/test.swf and b/tests/tests/swfs/avm2/movieclip_displayevents_enterframegoto/test.swf differ
diff --git a/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/MainTimeline.as b/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/MainTimeline.as
index 298625464..dd3043e87 100644
--- a/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/MainTimeline.as
+++ b/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/MainTimeline.as
@@ -46,6 +46,14 @@
 				case 12:
 					trace("/// (gotoAndStop(2) in exitFrame...)");
 					this.gotoAndStop(2);
+					break;
+				case 14:
+					trace("/// (gotoAndPlay(1) in exitFrame...)");
+					this.gotoAndPlay(1);
+					break;
+				case 15:
+					trace("/// (gotoAndPlay(3) in exitFrame...)");
+					this.gotoAndPlay(3);
 					this.destroy_me = true;
 					break;
 			}
diff --git a/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/output.txt b/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/output.txt
index 3db87b067..2771fc5fd 100644
--- a/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/output.txt
+++ b/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/output.txt
@@ -82,3 +82,25 @@ root1 (frame 2):[Event type="frameConstructed" bubbles=false cancelable=false ev
 root1 (frame 2):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
 ///Children: symbol_b 
 ///Children: symbol_b 
+root1 (frame 2):[Event type="enterFrame" bubbles=false cancelable=false eventPhase=2]
+root1 (frame 2):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
+root1 (frame 2):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
+/// (gotoAndPlay(1) in exitFrame...)
+root1 (frame 1):[Event type="removed" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 1):[Event type="added" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 1):[Event type="added" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 1):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
+//MainTimeline frame 1
+// symbol_a frame 1
+root1 (frame 1):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
+/// (gotoAndPlay(3) in exitFrame...)
+root1 (frame 1):[Event type="removed" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 3):[Event type="added" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 3):[Event type="added" bubbles=true cancelable=false eventPhase=3]
+root1 (frame 3):[Event type="frameConstructed" bubbles=false cancelable=false eventPhase=2]
+//MainTimeline frame 3
+// symbol_b frame 1
+root1 (frame 3):[Event type="exitFrame" bubbles=false cancelable=false eventPhase=2]
+///Children: symbol_b 
+///Children: symbol_b 
+///Children: symbol_b 
diff --git a/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/test.fla b/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/test.fla
index 61a1961ed..67a5559b4 100644
Binary files a/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/test.fla and b/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/test.fla differ
diff --git a/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/test.swf b/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/test.swf
index 936b589ed..8d91240d1 100644
Binary files a/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/test.swf and b/tests/tests/swfs/avm2/movieclip_displayevents_exitframegoto/test.swf differ