diff --git a/test/.gitignore b/test/.gitignore
index b7c6be1a1..8cdb4cf86 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -3,7 +3,6 @@
 *.data
 *.log
 *.runlog
-autocomplete.t
 col.t
 color.t
 config.t
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index daf1442c0..1492287b0 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -14,15 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${CMAKE_SOURCE_DIR}/test
                      ${TASK_INCLUDE_DIRS})
 
-set (test_SRCS autocomplete.t col.t color.t config.t
-               msg.t nibbler.t t.t tdb2.t text.t util.t view.t
-               lexer.t iso8601d.t iso8601p.t eval.t dates.t
-               variant_add.t variant_and.t variant_cast.t variant_divide.t
-               variant_equal.t variant_exp.t variant_gt.t variant_gte.t
-               variant_inequal.t variant_lt.t variant_lte.t variant_match.t
-               variant_math.t variant_modulo.t variant_multiply.t
-               variant_nomatch.t variant_not.t variant_or.t variant_partial.t
-               variant_subtract.t variant_xor.t)
+set (test_SRCS col.t color.t config.t msg.t nibbler.t t.t tdb2.t text.t util.t view.t lexer.t iso8601d.t iso8601p.t eval.t dates.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t)
 
 add_custom_target (test ./run_all --verbose
                         DEPENDS ${test_SRCS} task_executable
diff --git a/test/autocomplete.t.cpp b/test/autocomplete.t.cpp
deleted file mode 100644
index 728df22aa..000000000
--- a/test/autocomplete.t.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//
-// http://www.opensource.org/licenses/mit-license.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-#include <cmake.h>
-#include <iostream>
-#include <stdlib.h>
-#include <test.h>
-#include <util.h>
-#include <main.h>
-
-Context context;
-
-////////////////////////////////////////////////////////////////////////////////
-int main (int, char**)
-{
-  UnitTest t (8);
-
-  // Ensure environment has no influence.
-  unsetenv ("TASKDATA");
-  unsetenv ("TASKRC");
-
-  std::vector <std::string> options {"abc", "abcd", "abcde", "bcdef", "cdefg"};
-  std::vector <std::string> matches;
-  int result = autoComplete ("", options, matches);
-  t.is (result, 0, "no match on empty string");
-
-  result = autoComplete ("x", options, matches);
-  t.is (result, 0, "no match on wrong string");
-
-  result = autoComplete ("abcd", options, matches);
-  t.is (result, 1, "exact match on 'abcd'");
-  t.is (matches[0], "abcd", "exact match on 'abcd'");
-
-  result = autoComplete ("ab", options, matches);
-  t.is (result, 3, "partial match on 'ab'");
-  t.is (matches[0], "abc", "partial match on 'abc'");
-  t.is (matches[1], "abcd", "partial match on 'abcd'");
-  t.is (matches[2], "abcde", "partial match on 'abcde'");
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////