diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
index 91e723380ab..56146b9d60d 100644
--- a/src/services/breakpoints.ts
+++ b/src/services/breakpoints.ts
@@ -80,6 +80,9 @@ module ts.BreakpointResolver {
                     case SyntaxKind.DoStatement:
                         return spanInDoStatement(<DoStatement>node);
 
+                    case SyntaxKind.DebuggerStatement:
+                        return spanInDebuggerStatement(node);
+
                     // Tokens:
                     case SyntaxKind.SemicolonToken:
                     case SyntaxKind.EndOfFileToken:
@@ -235,6 +238,11 @@ module ts.BreakpointResolver {
                 return spanInNode(doStatement.statement);
             }
 
+            function spanInDebuggerStatement(node: Node): TypeScript.TextSpan {
+                // Set breakpoint on debugger keyword
+                return textSpan(node.getChildAt(0, sourceFile));
+            }
+
             // Tokens:
             function spanInCommaToken(node: Node): TypeScript.TextSpan {
                 switch (node.parent.kind) {
diff --git a/tests/baselines/reference/bpSpan_debugger.baseline b/tests/baselines/reference/bpSpan_debugger.baseline
new file mode 100644
index 00000000000..700ef7a56a9
--- /dev/null
+++ b/tests/baselines/reference/bpSpan_debugger.baseline
@@ -0,0 +1,5 @@
+
+1  >debugger;
+    ~~~~~~~~~                                     => Pos: (0 to 8)  SpanInfo: {"start":0,"length":8}
+    >debugger
+    >:=> (line 1, col 0) to (line 1, col 8)
\ No newline at end of file
diff --git a/tests/cases/fourslash_old/breakpointValidationDebugger.ts b/tests/cases/fourslash/breakpointValidationDebugger.ts
similarity index 100%
rename from tests/cases/fourslash_old/breakpointValidationDebugger.ts
rename to tests/cases/fourslash/breakpointValidationDebugger.ts