diff --git a/src/test/kotlin/net/shadowfacts/cacao/view/ViewClickTests.kt b/src/test/kotlin/net/shadowfacts/cacao/view/ViewClickTests.kt
index 3be895c..2cda207 100644
--- a/src/test/kotlin/net/shadowfacts/cacao/view/ViewClickTests.kt
+++ b/src/test/kotlin/net/shadowfacts/cacao/view/ViewClickTests.kt
@@ -1,5 +1,6 @@
 package net.shadowfacts.cacao.view
 
+import net.shadowfacts.cacao.CacaoScreen
 import net.shadowfacts.cacao.Window
 import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.geometry.Rect
@@ -14,11 +15,13 @@ import java.util.concurrent.CompletableFuture
  */
 class ViewClickTests {
 
+	lateinit var screen: CacaoScreen
 	lateinit var window: Window
 
 	@BeforeEach
 	fun setup() {
-		window = Window()
+		screen = CacaoScreen()
+		window = screen.addWindow(Window())
 	}
 
 	@Test
diff --git a/src/test/kotlin/net/shadowfacts/cacao/view/button/ButtonClickTests.kt b/src/test/kotlin/net/shadowfacts/cacao/view/button/ButtonClickTests.kt
index a846556..ad8ebca 100644
--- a/src/test/kotlin/net/shadowfacts/cacao/view/button/ButtonClickTests.kt
+++ b/src/test/kotlin/net/shadowfacts/cacao/view/button/ButtonClickTests.kt
@@ -1,5 +1,6 @@
 package net.shadowfacts.cacao.view.button
 
+import net.shadowfacts.cacao.CacaoScreen
 import net.shadowfacts.cacao.Window
 import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.geometry.Size
@@ -17,11 +18,13 @@ import java.util.concurrent.CompletableFuture
  */
 class ButtonClickTests {
 
+	lateinit var screen: CacaoScreen
 	lateinit var window: Window
 
 	@BeforeEach
 	fun setup() {
-		window = Window()
+		screen = CacaoScreen()
+		window = screen.addWindow(Window())
 	}
 
 	@Test
diff --git a/src/test/kotlin/net/shadowfacts/cacao/view/button/EnumButtonTests.kt b/src/test/kotlin/net/shadowfacts/cacao/view/button/EnumButtonTests.kt
index a434fca..c0a7479 100644
--- a/src/test/kotlin/net/shadowfacts/cacao/view/button/EnumButtonTests.kt
+++ b/src/test/kotlin/net/shadowfacts/cacao/view/button/EnumButtonTests.kt
@@ -1,5 +1,6 @@
 package net.shadowfacts.cacao.view.button
 
+import net.shadowfacts.cacao.CacaoScreen
 import net.shadowfacts.cacao.Window
 import net.shadowfacts.cacao.geometry.Point
 import net.shadowfacts.cacao.geometry.Rect
@@ -28,11 +29,13 @@ class EnumButtonTests {
 		ONE, TWO, THREE
 	}
 
+	lateinit var screen: CacaoScreen
 	lateinit var window: Window
 
 	@BeforeEach
 	fun setup() {
-		window = Window()
+		screen = CacaoScreen()
+		window = screen.addWindow(Window())
 	}
 
 	@Test