diff --git a/Makefile b/Makefile
index 5462a2d..7c3f734 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ load_integration_tests = $(patsubst %,-l %, $(integration_tests))
 # Autocomplete binary distribution.
 ac_name    = fsautocomplete
 ac_exe     = $(bin_d)/$(ac_name).exe
-ac_version = 0.34.0
+ac_version = 0.36.0
 ac_archive = $(ac_name)-$(ac_version).zip
 ac_url     = https://github.com/fsharp/FsAutoComplete/releases/download/$(ac_version)/$(ac_name).zip
 
@@ -100,7 +100,11 @@ test unit-test fake-home:
 	$(emacs) $(load_files) --batch -f run-fsharp-unit-tests
 
 integration-test : $(ac_exe) packages fake-home
-	$(emacs) $(load_files) --batch -f run-fsharp-integration-tests
+ifdef test-selector
+	$(emacs) $(load_files) --batch --eval "(let ((fsharp--test-selector \"$(test-selector)\"))(run-fsharp-integration-tests))"
+else
+	$(emacs) $(load_files) --batch --eval "(run-fsharp-integration-tests)"
+endif
 
 test-all : unit-test integration-test check-compile check-declares
 
diff --git a/test/integration-tests.el b/test/integration-tests.el
index 2db11f0..68aeb73 100644
--- a/test/integration-tests.el
+++ b/test/integration-tests.el
@@ -143,7 +143,7 @@
          (fsharp-ac-parse-current-buffer t)
          (fsharp-ac/show-tooltip-at-point)
          (wait-for-condition tiptext)
-         (should-match "val func : x:int -> int\n\nFull name: Program.X.func"
+         (should-match "val func:[ \n]+x: int[ \n]+-> int"
                        tiptext))))))
 
 (ert-deftest check-errors ()
diff --git a/test/test-common.el b/test/test-common.el
index d1dfdc7..232d8df 100644
--- a/test/test-common.el
+++ b/test/test-common.el
@@ -2,6 +2,10 @@
 (require 'package)
 (require 'cl)
 
+
+(defvar fsharp--test-selector t
+  "SELECTOR used in ert tests.")
+
 (defmacro check (desc &rest body)
   "Wrap ert-deftest with a simpler interface."
   (declare (indent 1))
@@ -99,8 +103,8 @@ glob emacs/test/*test.el."
   (let ((test-files (if files files fsharp-test-files)))
     (mapc 'load-file test-files)
     (if noninteractive
-        (ert-run-tests-batch-and-exit)
-      (ert-run-tests-interactively t))))
+        (ert-run-tests-batch-and-exit fsharp--test-selector)
+      (ert-run-tests-interactively fsharp--test-selector))))
 
 (defconst fsharp-test-files
   (directory-files