 
 (ycmd-ert-deftest completion-at-point-clang
     "test-completion-at-point.cpp" 'c++-mode
-  :disabled t
   :line 8 :column 8
+  (skip-unless (not (version-list-< (version-to-list emacs-version) '(24 4))))
   (let ((expected (f-read "test-completion-at-point-expected.cpp"))
         (completion-at-point-functions (list #'ycmd-complete-at-point)))
     (completion-at-point)

        (should (= .line_num 5))))))

(ycmd-ert-deftest get-completions-python "test.py" 'python-mode
  :disabled t ;; TODO Find out why this fails sometimes
  :line 7 :column 3
  (let ((response (ycmd-get-completions :sync)))
    (let-alist response
      (should (cl-some (lambda (c)

         (body (cadr keys-and-body))
         (keys (car keys-and-body)))
    `(ert-deftest ,full-name ()
       (ycmd-ert-with-resource-buffer ,filename ,mode
         (let* ((request-backend (or ,(plist-get keys :request-backend)
                                     request-backend))
