diff --git a/src/daemon.rs b/src/daemon.rs
index d22fcabd..f6573313 100644
--- a/src/daemon.rs
+++ b/src/daemon.rs
@@ -134,18 +134,20 @@ impl<P: Program> Daemon<P> {
         Self: 'static,
         P::Message: message::MaybeDebug + message::MaybeClone,
     {
-        #[cfg(all(feature = "debug", not(target_arch = "wasm32")))]
-        let program = {
-            iced_debug::init(iced_debug::Metadata {
-                name: P::name(),
-                theme: None,
-                can_time_travel: cfg!(feature = "time-travel"),
-            });
+        #[cfg(feature = "debug")]
+        iced_debug::init(iced_debug::Metadata {
+            name: P::name(),
+            theme: None,
+            can_time_travel: cfg!(feature = "time-travel"),
+        });
 
-            iced_devtools::attach(self)
-        };
+        #[cfg(feature = "tester")]
+        let program = iced_tester::attach(self);
 
-        #[cfg(any(not(feature = "debug"), target_arch = "wasm32"))]
+        #[cfg(all(feature = "debug", not(feature = "tester")))]
+        let program = iced_devtools::attach(self);
+
+        #[cfg(not(any(feature = "tester", feature = "debug")))]
         let program = self;
 
         Ok(shell::run(program)?)
diff --git a/tester/src/lib.rs b/tester/src/lib.rs
index d8a8df71..6b3ed9ff 100644
--- a/tester/src/lib.rs
+++ b/tester/src/lib.rs
@@ -65,10 +65,15 @@ where
     }
 
     fn window(&self) -> Option<window::Settings> {
-        self.program.window().map(|window| window::Settings {
-            size: window.size + Size::new(300.0, 80.0),
-            ..window
-        })
+        Some(
+            self.program
+                .window()
+                .map(|window| window::Settings {
+                    size: window.size + Size::new(300.0, 80.0),
+                    ..window
+                })
+                .unwrap_or_default(),
+        )
     }
 
     fn boot(&self) -> (Self::State, Task<Self::Message>) {