diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 6442236..9de5f16 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -196,6 +196,7 @@
 	test_perl \
 	test_plus_arg_edit \
 	test_popup \
+	test_popupwin \
 	test_preview \
 	test_profile \
 	test_prompt_buffer \
@@ -250,8 +251,8 @@
 	test_tagjump \
 	test_taglist \
 	test_tcl \
-	test_termencoding \
 	test_termcodes \
+	test_termencoding \
 	test_terminal \
 	test_terminal_fail \
 	test_textformat \
@@ -377,6 +378,7 @@
 	test_paste.res \
 	test_perl.res \
 	test_plus_arg_edit.res \
+	test_popupwin.res \
 	test_preview.res \
 	test_profile.res \
 	test_prompt_buffer.res \
@@ -409,8 +411,8 @@
 	test_system.res \
 	test_tab.res \
 	test_tcl.res \
-	test_termencoding.res \
 	test_termcodes.res \
+	test_termencoding.res \
 	test_terminal.res \
 	test_terminal_fail.res \
 	test_textformat.res \
diff --git a/src/testdir/dumps/Test_popupwin_01.dump b/src/testdir/dumps/Test_popupwin_01.dump
new file mode 100644
index 0000000..b3818c1
--- /dev/null
+++ b/src/testdir/dumps/Test_popupwin_01.dump
@@ -0,0 +1,10 @@
+>1+0&#ffffff0| @73
+|2| @73
+|3| @8|h+0&#5fd7ff255|e|l@1|o| |t|h|e|r|e| @8|r+0#0000001#ffd7ff255| |o|n|e| @8| +0#0000000#ffffff0@30
+|4| @22|a+0#0000001#ffd7ff255|n|o|t|h|e|r| |t|w|o| @8| +0#0000000#ffffff0@30
+|5| @22|a+0#0000001#ffd7ff255|n|o|t|h|e|r| |t|h|r|e@1| @6| +0#0000000#ffffff0@30
+|6| @73
+|7| @73
+|8| @73
+|9| @73
+@57|1|,|1| @10|T|o|p| 
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
new file mode 100644
index 0000000..7bae0b5
--- /dev/null
+++ b/src/testdir/test_popupwin.vim
@@ -0,0 +1,26 @@
+" Tests for popup windows
+
+if !has('textprop')
+  finish
+endif
+
+source screendump.vim
+
+func Test_simple_popup()
+  if !CanRunVimInTerminal()
+    return
+  endif
+  call writefile([
+	\ "call setline(1, range(1, 100))",
+	\ "let winid = popup_create('hello there', {'line': 3, 'col': 11})",
+	\ "hi PopupColor ctermbg=lightblue",
+	\ "call setwinvar(winid, '&wincolor', 'PopupColor')",
+	\ "let winid2 = popup_create(['another one', 'another two', 'another three'], {'line': 3, 'col': 25})",
+	\], 'XtestPopup')
+  let buf = RunVimInTerminal('-S XtestPopup', {'rows': 10})
+  call VerifyScreenDump(buf, 'Test_popupwin_01', {})
+
+  " clean up
+  call StopVimInTerminal(buf)
+  call delete('XtestPopup')
+endfunc