diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 7f77692..d7c0516 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -103,6 +103,12 @@
   if exists("*TearDown")
     call TearDown()
   endif
+
+  " Close any extra windows and make the current one not modified.
+  while winnr('$') > 1
+    bwipe!
+  endwhile
+  set nomodified
 endfunc
 
 " Source the test script.  First grab the file name, in case the script
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index d5f50ca..708739c 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -203,7 +203,6 @@
   call feedkeys("aM\<f5>\<enter>\<esc>", 'tx')
   call assert_equal(["March", "M", "March"], getline(1,4))
   %d
-  bwipe!
 endfu
 
 
@@ -233,7 +232,6 @@
   call feedkeys("a\<f5>\<c-p>\<c-p>\<enter>\<esc>", 'tx')
   call assert_equal('December', getline(1))
 
-  bwipe!
   iunmap <F5>
 endfunc
 
diff --git a/src/version.c b/src/version.c
index eb2e7f6..f6d56d1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2149,
+/**/
     2148,
 /**/
     2147,