diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 92bd57b3..fce277f1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -15,11 +15,7 @@ add_executable(boost_cobalt_basic_tests
 
 target_link_libraries(boost_cobalt_main         Boost::cobalt)
 target_link_libraries(boost_cobalt_main_compile Boost::cobalt)
-target_link_libraries(boost_cobalt_basic_tests  Boost::cobalt)
-
-if (TARGET Boost::unit_test_framework)
-    target_link_libraries(boost_cobalt_basic_tests  Boost::unit_test_framework)
-endif()
+target_link_libraries(boost_cobalt_basic_tests  Boost::cobalt Boost::unit_test_framework)
 
 add_test(NAME boost_cobalt_main COMMAND boost_cobalt_main)
 add_test(NAME boost_cobalt_basic_tests COMMAND boost_cobalt_basic_tests)
diff --git a/test/generator.cpp b/test/generator.cpp
index 0e48b0ca..3b0e8f96 100644
--- a/test/generator.cpp
+++ b/test/generator.cpp
@@ -216,7 +216,7 @@ CO_TEST_CASE(stop)
   while (g)
     co_await g;
 
-  auto gg =std::move(g);
+  auto gg = std::move(g);
 }
 
 cobalt::generator<int, int> eager()
diff --git a/test/test.hpp b/test/test.hpp
index c3abab96..6d15af3b 100644
--- a/test/test.hpp
+++ b/test/test.hpp
@@ -61,7 +61,8 @@ static ::boost::cobalt::task<void> Function##_impl()
 struct stop
 {
   bool await_ready() {return false;}
-  void await_suspend(std::coroutine_handle<> h) { boost::cobalt::detail::self_destroy(h); }
+  template<typename Promise>
+  void await_suspend(std::coroutine_handle<Promise> h) { boost::cobalt::detail::self_destroy(h); }
   void await_resume() {}
 };