diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 082c90c2785b..a3ab6121fd39 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -206,7 +206,7 @@ testrunner_SOURCES = \
 	ixfr.cc ixfr.hh \
 	logger.cc logger.hh \
 	misc.cc misc.hh \
-	mtasker_fcontext.cc \
+	mtasker_context.cc \
 	negcache.hh negcache.cc \
 	namespaces.hh \
 	nsecrecords.cc \
diff --git a/pdns/recursordist/test-mtasker.cc b/pdns/recursordist/test-mtasker.cc
index 9da5825586c1..f6f1b5b46549 100644
--- a/pdns/recursordist/test-mtasker.cc
+++ b/pdns/recursordist/test-mtasker.cc
@@ -47,7 +47,7 @@ static void willThrow(void* p)
 
 
 BOOST_AUTO_TEST_CASE(test_MtaskerException) {
-  BOOST_CHECK_EXCEPTION( {
+  BOOST_CHECK_THROW( {
       MTasker<> mt;
       mt.makeThread(willThrow, 0);
       struct timeval now;
@@ -55,6 +55,6 @@ BOOST_AUTO_TEST_CASE(test_MtaskerException) {
       for(;;) {
 	mt.schedule(&now);
       }
-    }, std::exception, [](const std::exception& e) { return true; });
+    }, std::exception);
 }
 BOOST_AUTO_TEST_SUITE_END()