diff --git a/pipe_io_server/test_pipe_io_server.py b/pipe_io_server/test_pipe_io_server.py
index b3062e2..2132474 100644
--- a/pipe_io_server/test_pipe_io_server.py
+++ b/pipe_io_server/test_pipe_io_server.py
@@ -1,5 +1,5 @@
 # pylint: disable=redefined-outer-name
-from os import stat, urandom
+from os import stat, urandom, remove
 from os.path import exists, dirname, realpath, join
 from stat import S_ISFIFO
 from secrets import token_urlsafe
@@ -130,6 +130,15 @@ def test_start_open_eof_stop():
         raise_if_thread_blocks(target=pipe_io.wait, unblock_function=pipe_io.stop)
 
 
+def test_start_open_delete_pipes_stop():
+    pipe_io = EchoPipeIOServer(*get_test_init_params())
+    pipe_io.start()
+    with IOPipes(pipe_io.in_pipe, pipe_io.out_pipe):
+        remove(pipe_io.in_pipe)
+        remove(pipe_io.out_pipe)
+        raise_if_thread_blocks(target=pipe_io.wait, unblock_function=pipe_io.stop)
+
+
 @pytest.mark.parametrize(
     'test_data', [
         'Cats and cheese',