Index: debuginfo-tests/dexter-tests/deferred_globals.cpp
===================================================================
--- /dev/null
+++ debuginfo-tests/dexter-tests/deferred_globals.cpp
@@ -0,0 +1,30 @@
+// Purpose:
+// Ensure that debug information for a local variable does not hide
+// a global definition that has the same name.
+
+// UNSUPPORTED: system-windows
+
+// RUN: %dexter --fail-lt 1.0 -w \
+// RUN:     --builder 'clang' --debugger 'lldb' \
+// RUN:     --cflags "-g -O0" -v -- %s
+
+const int d = 100;
+
+extern int foo();
+
+int main()
+{
+    const int d = 4;
+    const float e = 4;  // DexLabel("main")
+    const char* f = "Woopy";
+    return d + foo();
+}
+
+int foo()
+{
+    return d; // DexLabel("foo")
+}
+
+// DexExpectWatchValue('d', '4', on_line='main')
+// DexExpectWatchValue('d', '100', on_line='foo')
+
Index: debuginfo-tests/dexter-tests/namespace.cpp
===================================================================
--- /dev/null
+++ debuginfo-tests/dexter-tests/namespace.cpp
@@ -0,0 +1,25 @@
+// Purpose:
+// Ensure that the debug information for a global variable includes
+// namespace information.
+
+// UNSUPPORTED: system-windows
+
+// RUN: %dexter --fail-lt 1.0 -w \
+// RUN:     --builder 'clang' --debugger 'lldb' \
+// RUN:     --cflags "-g -O0" -v -- %s
+
+#include <stdio.h>
+
+namespace monkey
+{
+    const int ape = 32;
+}
+
+int main()
+{
+     printf("hello %d\n", monkey::ape);// DexLabel('main')
+     return 0;
+}
+
+// DexExpectWatchValue('monkey::ape', 32, on_line='main')
+