diff --git a/fix_test_popup.patch b/fix_test_popup.patch
new file mode 100644
index 0000000..c78cf2a
--- /dev/null
+++ b/fix_test_popup.patch
@@ -0,0 +1,28 @@
+diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
+index 6e07393..eae8bc3 100644
+--- a/src/testdir/test_popup.vim
++++ b/src/testdir/test_popup.vim
+@@ -17,16 +17,18 @@ func! ListMonths()
+ endfunc
+ 
+ func! Test_popup_complete2()
+-  " Insert match immediately, if there is only one match
+-  "  <c-e> Should select a character from the line below
+-  " TODO: test disabled because the code change has been reverted.
+-  throw "Skipped: Bug with <c-e> and popupmenu not fixed yet"
++  " 'the popup menu is not visible' is not equivalent to  'the completion mode
++  " is not active'.
++  " After the type <F5>, Vim still stay in the first state of the completion
++  " mode.  It is not related to the visible of popup.
++  " So that, the first <C-E> behavior is `complete_CTRL-E`, and the second and
++  " more <C-E> is `i_CTRL_E`
+   new
+   inoremap <f5> <c-r>=ListMonths()<cr>
+   call append(1, ["December2015"])
+   :1
+   call feedkeys("aD\<f5>\<C-E>\<C-E>\<C-E>\<C-E>\<enter>\<esc>", 'tx')
+-  call assert_equal(["December2015", "", "December2015"], getline(1,3))
++  call assert_equal(["Dece", "", "December2015"], getline(1,3))
+   %d
+   bw!
+ endfu
diff --git a/vim.changes b/vim.changes
index 05f3c20..de678bf 100644
--- a/vim.changes
+++ b/vim.changes
@@ -16,7 +16,7 @@ Mon Sep 12 14:41:09 UTC 2016 - idonmez@suse.com
 Mon Sep 12 13:09:03 UTC 2016 - idonmez@suse.com
 
 - Update to version 8.0
- * Crash on exit when EXITFREE is defined. (Dominique Pelle)
+  * Crash on exit when EXITFREE is defined. (Dominique Pelle)
   * Valgrind reports using uninitialzed memory. (Dominique Pelle)
   * Test 86 and 87 fail with some version of Python.
   * Netbeans test fails when run from unpacked MS-Windows sources.
@@ -26,7 +26,7 @@ Mon Sep 12 13:09:03 UTC 2016 - idonmez@suse.com
     with the new regexp engine. (Harm te Hennepe)
   * Regexp fails to match when using "\>\)\?". (Ramel)
   * Reading past end of line when using previous substitute pattern. 
-   (Dominique Pelle)
+    (Dominique Pelle)
   * Attempt to read history entry while not initialized.
   * Compiler warnings with Solaris Studio when using GTK3.
   * Memory leak in timer_start().
diff --git a/vim.spec b/vim.spec
index 590931e..251f367 100644
--- a/vim.spec
+++ b/vim.spec
@@ -92,6 +92,7 @@ Patch15:        %{name}-7.4-filetype_apparmor.patch
 Patch18:        %{name}-7.3-filetype_spec.patch
 Patch21:        %{name}-7.3-filetype_changes.patch
 Patch22:        %{name}-7.4-filetype_mine.patch
+Patch23:        fix_test_popup.patch
 Patch100:       vim73-no-static-libpython.patch
 
 %description
@@ -166,6 +167,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 %patch18 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 %patch100 -p1
 cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .