diff --git a/Framework/Tests/FloatingPanelControllerTests.swift b/Framework/Tests/FloatingPanelControllerTests.swift
index dbfd8ea..0afd12e 100644
--- a/Framework/Tests/FloatingPanelControllerTests.swift
+++ b/Framework/Tests/FloatingPanelControllerTests.swift
@@ -82,25 +82,21 @@ class FloatingPanelControllerTests: XCTestCase {
         XCTAssertEqual(fpc.surfaceView.frame.minY, fpc.originYOfSurface(for: .hidden))
 
         fpc.move(to: .full, animated: true)
-        waitRunLoop(secs: 0.3)
         XCTAssertEqual(fpc.position, .full)
         XCTAssertEqual(delegate.position, .full)
         XCTAssertEqual(fpc.surfaceView.frame.minY, fpc.originYOfSurface(for: .full))
 
         fpc.move(to: .half, animated: true)
-        waitRunLoop(secs: 0.3)
         XCTAssertEqual(fpc.position, .half)
         XCTAssertEqual(delegate.position, .half)
         XCTAssertEqual(fpc.surfaceView.frame.minY, fpc.originYOfSurface(for: .half))
 
         fpc.move(to: .tip, animated: true)
-        waitRunLoop(secs: 0.3)
         XCTAssertEqual(fpc.position, .tip)
         XCTAssertEqual(delegate.position, .tip)
         XCTAssertEqual(fpc.surfaceView.frame.minY, fpc.originYOfSurface(for: .tip))
 
         fpc.move(to: .hidden, animated: true)
-        waitRunLoop(secs: 0.3)
         XCTAssertEqual(fpc.position, .hidden)
         XCTAssertEqual(delegate.position, .hidden)
         XCTAssertEqual(fpc.surfaceView.frame.minY, fpc.originYOfSurface(for: .hidden))
diff --git a/Framework/Tests/FloatingPanelSurfaceViewTests.swift b/Framework/Tests/FloatingPanelSurfaceViewTests.swift
index 8fb9179..49e1655 100644
--- a/Framework/Tests/FloatingPanelSurfaceViewTests.swift
+++ b/Framework/Tests/FloatingPanelSurfaceViewTests.swift
@@ -24,10 +24,7 @@ class FloatingPanelSurfaceViewTests: XCTestCase {
     }
 
     func test_surfaceView_constraintsUpdate() {
-        let window = UIWindow()
         let surface = FloatingPanelSurfaceView(frame: CGRect(x: 0.0, y: 0.0, width: 320.0, height: 480.0))
-        window.addSubview(surface)
-        window.makeKeyAndVisible()
         XCTAssert(surface.contentView == nil)
         surface.layoutIfNeeded()
         XCTAssert(surface.grabberHandle.frame.minY == 6.0)
@@ -36,11 +33,10 @@ class FloatingPanelSurfaceViewTests: XCTestCase {
 
         surface.grabberHandleWidth = 44.0
         surface.grabberHandleHeight = 12.0
+        surface.setNeedsLayout()
         surface.layoutIfNeeded()
-        waitRunLoop(secs: 0.000_001)
         XCTAssert(surface.grabberHandle.frame.width == surface.grabberHandleWidth, "\(surface.grabberHandle.frame.width) == \(surface.grabberHandleWidth)")
         XCTAssert(surface.grabberHandle.frame.height == surface.grabberHandleHeight, "\(surface.grabberHandle.frame.height) == \(surface.grabberHandleHeight)")
-        window.resignKey()
     }
 
     func test_surfaceView_cornderRaduis() {