diff --git a/python/helpers/pydev/tests_pydevd_python/test_bytecode_modification.py b/python/helpers/pydev/tests_pydevd_python/test_bytecode_modification.py
index cd928bbfe8f8..fef39607f2d7 100644
--- a/python/helpers/pydev/tests_pydevd_python/test_bytecode_modification.py
+++ b/python/helpers/pydev/tests_pydevd_python/test_bytecode_modification.py
@@ -64,7 +64,7 @@ class TestInsertCode(unittest.TestCase):
         finally:
             sys.stdout = self.original_stdout
 
-    def test_if_else(self):
+    def test_if(self):
         self.original_stdout = sys.stdout
         sys.stdout = StringIO()
 
@@ -82,6 +82,68 @@ class TestInsertCode(unittest.TestCase):
         finally:
             sys.stdout = self.original_stdout
 
+    def test_else(self):
+        self.original_stdout = sys.stdout
+        sys.stdout = StringIO()
+
+        try:
+            def original():
+                if False:
+                    a = 1
+                else:
+                    a = 0
+                print(a)
+
+            self.check_insert_to_line(original, tracing, original.__code__.co_firstlineno + 4)
+            self.check_insert_to_line(original, tracing, original.__code__.co_firstlineno + 5)
+
+        finally:
+            sys.stdout = self.original_stdout
+
+    def test_for_else(self):
+        self.original_stdout = sys.stdout
+        sys.stdout = StringIO()
+
+        try:
+            def original():
+                sum = 0
+                for i in range(3):
+                    sum += i
+                else:
+                    print(sum)
+
+            self.check_insert_to_line(original, tracing, original.__code__.co_firstlineno + 1)
+            self.check_insert_to_line(original, tracing, original.__code__.co_firstlineno + 3)
+            self.check_insert_to_line(original, tracing, original.__code__.co_firstlineno + 5)
+
+        finally:
+            sys.stdout = self.original_stdout
+
+    def test_elif(self):
+        self.original_stdout = sys.stdout
+        sys.stdout = StringIO()
+
+        try:
+            def original():
+                a = 5
+                b = 0
+                if a < 0:
+                    print("a < 0")
+                elif a < 3:
+                    print("a < 3")
+                else:
+                    print("a >= 3")
+                    b = a
+                return b
+
+            self.check_insert_to_line(original, tracing, original.__code__.co_firstlineno + 1)
+            self.check_insert_to_line(original, tracing, original.__code__.co_firstlineno + 2)
+            self.check_insert_to_line(original, tracing, original.__code__.co_firstlineno + 8)
+            self.check_insert_to_line(original, tracing, original.__code__.co_firstlineno + 9)
+
+        finally:
+            sys.stdout = self.original_stdout
+
     def test_call_other_function(self):
         self.original_stdout = sys.stdout
         sys.stdout = StringIO()