diff -Nru irony-mode-1.2.0/debian/changelog irony-mode-1.2.0/debian/changelog
--- irony-mode-1.2.0/debian/changelog	2017-12-28 21:30:05.000000000 +0000
+++ irony-mode-1.2.0/debian/changelog	2018-01-07 23:39:00.000000000 +0000
@@ -1,3 +1,13 @@
+irony-mode (1.2.0-4) unstable; urgency=medium
+
+  * Drop ert-helper.el.
+  * Import upstream fix for failing ert test in autopkgtest:
+    - Fixes "FAILED  31/41  irony/find-server-executable/does-not-exists"
+  * Switch to debhelper 11.
+  * Declare compat level 11.
+
+ -- Nicholas D Steeves <nsteeves@gmail.com>  Sun, 07 Jan 2018 18:39:00 -0500
+
 irony-mode (1.2.0-3) unstable; urgency=medium
 
   * Switch to libclang-5.0-dev, now that Bug #881663 has been resolved.
diff -Nru irony-mode-1.2.0/debian/compat irony-mode-1.2.0/debian/compat
--- irony-mode-1.2.0/debian/compat	2017-12-28 21:30:05.000000000 +0000
+++ irony-mode-1.2.0/debian/compat	2018-01-07 23:39:00.000000000 +0000
@@ -1 +1 @@
-10
+11
diff -Nru irony-mode-1.2.0/debian/control irony-mode-1.2.0/debian/control
--- irony-mode-1.2.0/debian/control	2017-12-28 21:30:05.000000000 +0000
+++ irony-mode-1.2.0/debian/control	2018-01-07 23:39:00.000000000 +0000
@@ -5,7 +5,7 @@
 Uploaders: Christoph Egger <christoph@debian.org>,
  Nicholas D Steeves <nsteeves@gmail.com>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  cmake,
  libclang-5.0-dev,
  dh-elpa,
diff -Nru irony-mode-1.2.0/debian/elpa-test irony-mode-1.2.0/debian/elpa-test
--- irony-mode-1.2.0/debian/elpa-test	2017-12-28 21:30:05.000000000 +0000
+++ irony-mode-1.2.0/debian/elpa-test	2018-01-07 23:39:00.000000000 +0000
@@ -1,2 +1,2 @@
 autopkgtest_keep = server/test/elisp/*
-ert_helper = debian/ert-helper.el
+
diff -Nru irony-mode-1.2.0/debian/ert-helper.el irony-mode-1.2.0/debian/ert-helper.el
--- irony-mode-1.2.0/debian/ert-helper.el	2017-12-28 21:30:05.000000000 +0000
+++ irony-mode-1.2.0/debian/ert-helper.el	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-(load-file "server/test/elisp/test-config.el")
-(ert-run-tests-batch-and-exit)
diff -Nru irony-mode-1.2.0/debian/patches/03-fix-irony.el-does-not-exists-test-when-irony-server-.patch irony-mode-1.2.0/debian/patches/03-fix-irony.el-does-not-exists-test-when-irony-server-.patch
--- irony-mode-1.2.0/debian/patches/03-fix-irony.el-does-not-exists-test-when-irony-server-.patch	1970-01-01 00:00:00.000000000 +0000
+++ irony-mode-1.2.0/debian/patches/03-fix-irony.el-does-not-exists-test-when-irony-server-.patch	2018-01-07 23:39:00.000000000 +0000
@@ -0,0 +1,23 @@
+From: Guillaume Papin <guillaume.papin@epitech.eu>
+Date: Thu, 4 Jan 2018 20:09:27 +0100
+Subject: fix irony.el does-not-exists test,
+ when irony-server is in exec-path [GH-460]
+
+---
+ server/test/elisp/irony.el | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/server/test/elisp/irony.el b/server/test/elisp/irony.el
+index 59eeb56..fe2378b 100644
+--- a/server/test/elisp/irony.el
++++ b/server/test/elisp/irony.el
+@@ -16,7 +16,8 @@
+     (should (equal 1 (irony--buffer-size-in-bytes)))))
+ 
+ (ert-deftest irony/find-server-executable/does-not-exists ()
+-  (let ((irony-server-install-prefix "/does/not/exists"))
++  (let ((irony-server-install-prefix "/does/not/exists")
++        (exec-path nil))
+     (should-error (irony--find-server-executable)
+                   :type 'irony-server-error)))
+ 
diff -Nru irony-mode-1.2.0/debian/patches/series irony-mode-1.2.0/debian/patches/series
--- irony-mode-1.2.0/debian/patches/series	2017-12-28 21:30:05.000000000 +0000
+++ irony-mode-1.2.0/debian/patches/series	2018-01-07 23:39:00.000000000 +0000
@@ -1,2 +1,3 @@
 01-fix-install-prefix.patch
 02-irony-iotask-fix-spurious-failure-of-invalid-msg-test.patch
+03-fix-irony.el-does-not-exists-test-when-irony-server-.patch