diff --git a/src/server/mirror.c b/src/server/mirror.c
index b1d917b..75bf3f5 100644
--- a/src/server/mirror.c
+++ b/src/server/mirror.c
@@ -671,6 +671,7 @@ static void mirror_abandon_cb(struct ev_loop *loop, ev_io * w, int revents)
     debug("Abandon message received");
     mirror_set_state(ctrl->mirror, MS_ABANDONED);
     self_pipe_signal_clear(ctrl->mirror->abandon_signal);
+    ev_io_stop(loop, &ctrl->abandon_watcher);
     ev_break(loop, EVBREAK_ONE);
     return;
 }
diff --git a/tests/acceptance/test_write_during_migration.rb b/tests/acceptance/test_write_during_migration.rb
index 70ef9e6..bbe41ff 100755
--- a/tests/acceptance/test_write_during_migration.rb
+++ b/tests/acceptance/test_write_during_migration.rb
@@ -86,6 +86,14 @@ class TestWriteDuringMigration < Test::Unit::TestCase
     end
   end
 
+  def stop_mirror
+    UNIXSocket.open(@source_sock) do |sock|
+      sock.write("break\x0A\x0A")
+      sock.flush
+      sock.readline
+    end
+  end
+
   def wait_for_quit
     Timeout.timeout(10) do
       Process.waitpid2(@dst_proc)
@@ -195,4 +203,22 @@ class TestWriteDuringMigration < Test::Unit::TestCase
       end
     end
   end
+
+  def test_mirroring_can_be_restarted
+    Dir.mktmpdir do |tmpdir|
+      Dir.chdir(tmpdir) do
+        make_files
+
+        launch_servers
+
+        3.times do
+          start_mirror
+          stop_mirror
+        end
+        start_mirror
+
+        wait_for_quit
+      end
+    end
+  end
 end