diff --git a/src/Main.cxx b/src/Main.cxx
index fd10d2253..1bee66ca8 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -411,7 +411,7 @@ int mpd_main(int argc, char *argv[])
 	}
 
 	main_thread = ThreadId::GetCurrent();
-	main_loop = new EventLoop(EventLoop::Default());
+	main_loop = new EventLoop();
 
 	instance = new Instance();
 
diff --git a/src/event/Loop.cxx b/src/event/Loop.cxx
index 6bbb6df8e..4ded68ff4 100644
--- a/src/event/Loop.cxx
+++ b/src/event/Loop.cxx
@@ -28,7 +28,7 @@
 
 #include <algorithm>
 
-EventLoop::EventLoop(Default)
+EventLoop::EventLoop()
 	:SocketMonitor(*this),
 	 now_ms(::MonotonicClockMS()),
 	 quit(false), busy(true),
diff --git a/src/event/Loop.hxx b/src/event/Loop.hxx
index 322c1ec82..56804dc81 100644
--- a/src/event/Loop.hxx
+++ b/src/event/Loop.hxx
@@ -115,9 +115,7 @@ class EventLoop final : SocketMonitor
 	ThreadId thread;
 
 public:
-	struct Default {};
-
-	EventLoop(Default dummy=Default());
+	EventLoop();
 	~EventLoop();
 
 	/**
diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx
index 1401a6a1e..095d9945d 100644
--- a/test/read_mixer.cxx
+++ b/test/read_mixer.cxx
@@ -115,7 +115,7 @@ int main(int argc, gcc_unused char **argv)
 	g_thread_init(NULL);
 #endif
 
-	main_loop = new EventLoop(EventLoop::Default());
+	main_loop = new EventLoop;
 
 	Error error;
 	Mixer *mixer = mixer_new(&alsa_mixer_plugin, nullptr,
diff --git a/test/run_avahi.cxx b/test/run_avahi.cxx
index d1c153cfd..b3b20365c 100644
--- a/test/run_avahi.cxx
+++ b/test/run_avahi.cxx
@@ -29,7 +29,7 @@ unsigned listen_port = 1234;
 int
 main(gcc_unused int argc, gcc_unused char **argv)
 {
-	EventLoop event_loop((EventLoop::Default()));
+	EventLoop event_loop;
 	const ShutdownHandler shutdown_handler(event_loop);
 
 	AvahiInit(event_loop, "test");
diff --git a/test/run_inotify.cxx b/test/run_inotify.cxx
index 7d77372f0..df4046356 100644
--- a/test/run_inotify.cxx
+++ b/test/run_inotify.cxx
@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 
 	path = argv[1];
 
-	EventLoop event_loop((EventLoop::Default()));
+	EventLoop event_loop;
 	const ShutdownHandler shutdown_handler(event_loop);
 
 	Error error;
diff --git a/test/run_neighbor_explorer.cxx b/test/run_neighbor_explorer.cxx
index 374114b11..c79948d6e 100644
--- a/test/run_neighbor_explorer.cxx
+++ b/test/run_neighbor_explorer.cxx
@@ -66,7 +66,7 @@ main(int argc, char **argv)
 
 	/* initialize the core */
 
-	EventLoop loop((EventLoop::Default()));
+	EventLoop loop;
 
 	/* initialize neighbor plugins */
 
diff --git a/test/run_output.cxx b/test/run_output.cxx
index 55fcf3698..23fd1ad3a 100644
--- a/test/run_output.cxx
+++ b/test/run_output.cxx
@@ -189,7 +189,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	main_loop = new EventLoop(EventLoop::Default());
+	main_loop = new EventLoop();
 
 	io_thread_init();
 	io_thread_start();