diff --git a/src/test.cc b/src/test.cc
index d74d4496..7918440b 100644
--- a/src/test.cc
+++ b/src/test.cc
@@ -260,15 +260,16 @@ findDbForPathEnding(const std::string &path,
 bool runIndexTests(const std::string &filter_path, bool enable_update) {
   gTestOutputMode = true;
   std::string version = LLVM_VERSION_STRING;
+  const int majorVersion = LLVM_VERSION_MAJOR;
 
   // Index tests change based on the version of clang used.
-  static const char kRequiredClangVersion[] = "6.0.0";
-  if (version != kRequiredClangVersion &&
+  const int kMinRequiredClangVersion = 6;
+  if (majorVersion < kMinRequiredClangVersion &&
       version.find("svn") == std::string::npos) {
     fprintf(stderr,
-            "Index tests must be run using clang version %s, ccls is running "
+            "Index tests must be run using clang major version >= %d, ccls is running "
             "with %s\n",
-            kRequiredClangVersion, version.c_str());
+            kMinRequiredClangVersion, version.c_str());
     return false;
   }
 
diff --git a/src/threaded_queue.hh b/src/threaded_queue.hh
index c2927640..bca221b8 100644
--- a/src/threaded_queue.hh
+++ b/src/threaded_queue.hh
@@ -46,6 +46,9 @@ private:
 
 struct MultiQueueWaiter {
   std::condition_variable_any cv;
+  ~MultiQueueWaiter() {
+	  cv.notify_all();
+  }
 
   static bool hasState(std::initializer_list<BaseThreadQueue *> queues) {
     for (BaseThreadQueue *queue : queues) {