diff --git a/jerry-core/jerry-snapshot.h b/jerry-core/jerry-snapshot.h
index c6a95c98c..58555dddb 100644
--- a/jerry-core/jerry-snapshot.h
+++ b/jerry-core/jerry-snapshot.h
@@ -36,6 +36,6 @@ typedef struct
 /**
  * Jerry snapshot format version
  */
-#define JERRY_SNAPSHOT_VERSION (6u)
+#define JERRY_SNAPSHOT_VERSION (7u)
 
 #endif /* !JERRY_SNAPSHOT_H */
diff --git a/jerry-core/parser/js/byte-code.h b/jerry-core/parser/js/byte-code.h
index a23ca6d7c..3494ae641 100644
--- a/jerry-core/parser/js/byte-code.h
+++ b/jerry-core/parser/js/byte-code.h
@@ -206,20 +206,6 @@
 /* PARSER_TRY_CONTEXT_STACK_ALLOCATION must be <= 3 */
 #define PARSER_TRY_CONTEXT_STACK_ALLOCATION 2
 
-#ifdef JERRY_DEBUGGER
-
-#define CBC_BREAKPOINT_OPCODES \
-  CBC_OPCODE (CBC_BREAKPOINT_ENABLED, CBC_NO_FLAG, 0, \
-              VM_OC_BREAKPOINT_ENABLED) \
-  CBC_OPCODE (CBC_BREAKPOINT_DISABLED, CBC_NO_FLAG, 0, \
-              VM_OC_BREAKPOINT_DISABLED) \
-
-#else /* !JERRY_DEBUGGER */
-
-#define CBC_BREAKPOINT_OPCODES
-
-#endif /* JERRY_DEBUGGER */
-
 /**
  * Opcode definitions.
  */
@@ -331,7 +317,10 @@
               VM_OC_RET) \
   CBC_OPCODE (CBC_RETURN_WITH_LITERAL, CBC_HAS_LITERAL_ARG, 0, \
               VM_OC_RET | VM_OC_GET_LITERAL) \
-  CBC_BREAKPOINT_OPCODES \
+  CBC_OPCODE (CBC_BREAKPOINT_ENABLED, CBC_NO_FLAG, 0, \
+              VM_OC_BREAKPOINT_ENABLED) \
+  CBC_OPCODE (CBC_BREAKPOINT_DISABLED, CBC_NO_FLAG, 0, \
+              VM_OC_BREAKPOINT_DISABLED) \
   \
   /* Unary opcodes. */ \
   CBC_UNARY_OPERATION (CBC_PLUS, \