diff --git a/.gitignore b/.gitignore
index 41248087..b1e15bf9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 Debug
 build
 cquery_diagnostics.log
+e2e_cache
 foo
 libcxx
 waf-*
diff --git a/full_tests/index_delta/a_v0.cc b/full_tests/index_delta/a_v0.cc
deleted file mode 100644
index f3d9c2f8..00000000
--- a/full_tests/index_delta/a_v0.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-void called();
-
-void caller() {
-
-}
-
-void missing() {}
\ No newline at end of file
diff --git a/full_tests/index_delta/a_v1.cc b/full_tests/index_delta/a_v1.cc
deleted file mode 100644
index 5ab07112..00000000
--- a/full_tests/index_delta/a_v1.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-void called();
-
-void caller() {
-  called();
-}
-
-void added() {}
\ No newline at end of file
diff --git a/full_tests/simple_cross_reference/a.cc b/full_tests/simple_cross_reference/a.cc
deleted file mode 100644
index fd0f6175..00000000
--- a/full_tests/simple_cross_reference/a.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "a.h"
-
-namespace {
-void LocalA() {
-  Common();
-}
-}  // namespace
-
-void Common() {}
\ No newline at end of file
diff --git a/full_tests/simple_cross_reference/a.h b/full_tests/simple_cross_reference/a.h
deleted file mode 100644
index c5b5775f..00000000
--- a/full_tests/simple_cross_reference/a.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef A_H_
-#define A_H_
-
-void Common();
-
-#endif  // A_H_
\ No newline at end of file
diff --git a/full_tests/simple_cross_reference/b.cc b/full_tests/simple_cross_reference/b.cc
deleted file mode 100644
index d6a820fd..00000000
--- a/full_tests/simple_cross_reference/b.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "a.h"
-
-#if RANDOM_DEFINE
-static void LocalB() {
-  Common();
-}
-#endif  // RANDOM_DEFINE
-
-static void LocalC() {}
\ No newline at end of file
diff --git a/full_tests/simple_cross_reference/c.cc b/full_tests/simple_cross_reference/c.cc
deleted file mode 100644
index d1dc600f..00000000
--- a/full_tests/simple_cross_reference/c.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "a.h"
-
-#if RANDOM_DEFINE
-static void LocalC() {
-  Common();
-}
-#endif  // RANDOM_DEFINE
-
-static void LocalD() {}
\ No newline at end of file
diff --git a/full_tests/simple_cross_reference/compile_commands2.json b/full_tests/simple_cross_reference/compile_commands2.json
deleted file mode 100644
index 0b8a04d8..00000000
--- a/full_tests/simple_cross_reference/compile_commands2.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "directory" : "full_tests/simple_cross_reference",
-    "command" : "clang -c -o a.o a.cc",
-    "file" : "a.cc"
-  },
-  {
-    "directory" : "full_tests/simple_cross_reference",
-    "command" : "clang -DRANDOM_DEFINE -c -o b.o b.cc",
-    "file" : "b.cc"
-  },
-  {
-    "directory" : "full_tests/simple_cross_reference",
-    "command" : "clang -DRANDOM_DEFINE -c -o b.o b.cc",
-    "file" : "test.cc"
-  }
-]
\ No newline at end of file
diff --git a/full_tests/simple_cross_reference/test.cc b/full_tests/simple_cross_reference/test.cc
deleted file mode 100644
index 94e5ff8d..00000000
--- a/full_tests/simple_cross_reference/test.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-void foo() {}
-void bar() {}
-
-void foobar();
-
-void foobar(int a, int b) {};
-
-class HelloWorld {
-  void method() {}
-};
-
-static void staticfoo() {
-}
\ No newline at end of file
diff --git a/test_runner_e2e.py b/test_runner_e2e.py
deleted file mode 100755
index e152a1d1..00000000
--- a/test_runner_e2e.py
+++ /dev/null
@@ -1,305 +0,0 @@
-#!/usr/bin/python
-
-import json
-import re
-import shlex
-import shutil
-from subprocess import Popen, PIPE
-
-
-# FIXME: instead of $cquery/exitWhenIdle, just send $cquery/wait and the normal
-# lsp exit. This requires renaming $cquery/queryDbWaitForIdle to just
-# $cquery/wait.
-
-CQUERY_PATH = 'build/asan/bin/cquery'
-CACHE_DIR = 'e2e_CACHE'
-
-# Content-Length: ...\r\n
-# \r\n
-# {
-#   "jsonrpc": "2.0",
-#   "id": 1,
-#   "method": "textDocument/didOpen",
-#   "params": {
-#     ...
-#   }
-# }
-
-# We write test files in python. The test runner collects all python files in
-# the directory and executes them. The test function just creates a test object
-# which specifies expected stdin/stdout.
-#
-# Test functions are automatically discovered; they just need to be in the
-# global environment and start with `Test_`.
-
-
-class TestBuilder:
-  def __init__(self):
-    self.sent = []
-    self.expected = []
-
-  def IndexFile(self, path, contents):
-    """
-    Indexes the given file with contents.
-    """
-    self.Send({
-        'method': '$cquery/indexFile',
-        'params': {
-            'path': path,
-            'contents': contents,
-            'args': [
-                '-xc++',
-                '-std=c++11'
-            ]
-        }
-    })
-    return self
-
-  def WaitForIdle(self):
-    """
-    cquery will pause processing messages until it is idle.
-    """
-    self.Send({'method': '$cquery/wait'})
-    return self
-
-  def Send(self, stdin):
-    """
-    Send the given message to the language server.
-    """
-    stdin['jsonrpc'] = '2.0'
-    self.sent.append(stdin)
-    return self
-
-  def Expect(self, expected):
-    """
-    Expect a message from the language server.
-    """
-    expected['jsonrpc'] = '2.0'
-    self.expected.append(expected)
-    return self
-
-  def SetupCommonInit(self):
-    """
-    Add initialize/initialized messages.
-    """
-    self.Send({
-        'id': 0,
-        'method': 'initialize',
-        'params': {
-            'processId': 123,
-            'rootUri': 'cquery',
-            'capabilities': {},
-            'trace': 'off',
-            'initializationOptions': {
-                'cacheDirectory': CACHE_DIR
-            }
-        }
-    })
-    self.Expect({
-        'id': 0,
-        'result': {
-            'capabilities': {
-                'textDocumentSync': 2,
-                'hoverProvider': True,
-                'completionProvider': {
-                    'resolveProvider': False,
-                    'triggerCharacters': ['.', ':', '>', '#']
-                },
-                'signatureHelpProvider': {
-                    'triggerCharacters': ['(', ',']
-                },
-                'definitionProvider': True,
-                'referencesProvider': True,
-                'documentHighlightProvider': True,
-                'documentSymbolProvider': True,
-                'workspaceSymbolProvider': True,
-                'codeActionProvider': True,
-                'codeLensProvider': {
-                    'resolveProvider': False
-                },
-                'documentFormattingProvider': False,
-                'documentRangeFormattingProvider': False,
-                'renameProvider': True,
-                'documentLinkProvider': {
-                    'resolveProvider': False
-                }
-            }
-        }
-    })
-    return self
-
-
-def _ExecuteTest(name, func):
-  """
-  Executes a specific test.
-
-  |func| must return a TestBuilder object.
-  """
-
-  # Delete cache directory.
-  shutil.rmtree(CACHE_DIR, ignore_errors=True)
-
-  test_builder = func()
-  if not isinstance(test_builder, TestBuilder):
-    raise Exception('%s does not return a TestBuilder instance' % name)
-
-  # Add a final exit message.
-  test_builder.Send({'method': '$cquery/wait'})
-  test_builder.Send({'method': 'exit'})
-
-  # Convert messages to a stdin byte array.
-  stdin = ''
-  for message in test_builder.sent:
-    payload = json.dumps(message)
-    wrapped = 'Content-Length: %s\r\n\r\n%s' % (len(payload), payload)
-    stdin += wrapped
-  stdin_bytes = stdin.encode(encoding='UTF-8')
-
-  # Finds all messages in |string| by parsing Content-Length headers.
-  def GetMessages(string):
-    messages = []
-    for match in re.finditer('Content-Length: (\d+)\r\n\r\n', string):
-      start = match.span()[1]
-      length = int(match.groups()[0])
-      message = string[start:start + length]
-      decoded = json.loads(message)
-      # Do not report '$cquery/progress' messages.
-      if 'method' in decoded and decoded['method'] == '$cquery/progress':
-        continue
-      # Do not report 'textDocument/publishDiagnostic' messages.
-      if 'method' in decoded and decoded['method'] == 'textDocument/publishDiagnostics':
-        continue
-
-      messages.append(decoded)
-    return messages
-
-  # Utility method to print a byte array.
-  def PrintByteArray(bytes):
-    for line in bytes.split(b'\r\n'):
-      print(line.decode('utf8'))
-
-  # Execute program.
-  cmd = "%s --language-server --log-all-to-stderr" % CQUERY_PATH
-  process = Popen(shlex.split(cmd), stdin=PIPE, stdout=PIPE, stderr=PIPE)
-  (stdout, stderr) = process.communicate(stdin_bytes)
-  exit_code = process.wait()
-
-  # Check if test succeeded.
-  actual = GetMessages(stdout.decode('utf8'))
-  success = actual == test_builder.expected
-
-  # Print failure messages.
-  if success:
-    print('== Passed %s with exit_code=%s ==' % (name, exit_code))
-  else:
-    print('== FAILED %s with exit_code=%s ==' % (name, exit_code))
-    print('## STDIN:')
-    for message in GetMessages(stdin):
-      print(json.dumps(message, indent=True))
-    if stdout:
-      print('## STDOUT:')
-      for message in GetMessages(stdout.decode('utf8')):
-        print(json.dumps(message, indent=True))
-    if stderr:
-      print('## STDERR:')
-      PrintByteArray(stderr)
-
-    print('## Expected output')
-    for message in test_builder.expected:
-      print(message)
-    print('## Actual output')
-    for message in actual:
-      print(message)
-    print('## Difference')
-    common_end = min(len(test_builder.expected), len(actual))
-    for i in range(0, common_end):
-      if test_builder.expected[i] != actual[i]:
-        print('i=%s' % i)
-        print('- Expected %s' % str(test_builder.expected[i]))
-        print('- Actual %s' % str(actual[i]))
-    for i in range(common_end, len(test_builder.expected)):
-      print('Extra expected: %s' % str(test_builder.expected[i]))
-    for i in range(common_end, len(actual)):
-      print('Extra actual: %s' % str(actual[i]))
-
-
-def _DiscoverTests():
-  """
-  Discover and return all tests.
-  """
-  for name, value in globals().items():
-    if not callable(value):
-      continue
-    if not name.startswith('Test_'):
-      continue
-    yield (name, value)
-
-
-def _RunTests():
-  """
-  Executes all tests.
-  """
-  for name, func in _DiscoverTests():
-    _ExecuteTest(name, func)
-
-
-#### EXAMPLE TESTS ####
-
-
-class lsSymbolKind:
-  Function = 1
-
-
-def lsSymbolInfo(name, position, kind):
-  return {
-      'name': name,
-      'position': position,
-      'kind': kind
-  }
-
-
-def DISABLED_Test_Init():
-  return (TestBuilder()
-          .SetupCommonInit()
-          )
-
-
-def Test_Outline():
-  return (TestBuilder()
-          .SetupCommonInit()
-          .IndexFile("foo.cc",
-                     """void foobar();""")
-          .WaitForIdle()
-          .Send({
-              'id': 1,
-              'method': 'textDocument/documentSymbol',
-              'params': {
-                  'textDocument': {
-                      'uri': 'foo.cc'
-                  }
-              }
-          })
-          .Expect({
-              'jsonrpc': '2.0',
-              'id': 1, 'result': [
-                  {
-                      'containerName': 'void foobar()',
-                      'kind': 12,
-                      'name': 'foobar',
-                      'location': {
-                          'range': {
-                              'start': {
-                                  'line': 0,
-                                  'character': 5},
-                              'end': {
-                                  'line': 0,
-                                  'character': 11
-                              }
-                          },
-                          'uri': 'file://foo.cc'
-                      }
-                  }]}))
-
-
-if __name__ == '__main__':
-  _RunTests()