Index: tests/exceptions/cancel/coroutine.cfa
===================================================================
--- tests/exceptions/cancel/coroutine.cfa	(revision 8edbe407c24c9d794ff7c63d67c463043f96ae3b)
+++ tests/exceptions/cancel/coroutine.cfa	(revision f02f546a0bb9f23075f612531e3b22bef6122da8)
@@ -2,8 +2,7 @@
 
 #include <coroutine.hfa>
-#include <exception.hfa>
 
-EHM_EXCEPTION(internal_error)();
-EHM_VIRTUAL_TABLE(internal_error, internal_vt);
+exception internal_error {};
+vtable(internal_error) internal_vt;
 
 coroutine WillCancel {};
Index: tests/exceptions/cancel/thread.cfa
===================================================================
--- tests/exceptions/cancel/thread.cfa	(revision 8edbe407c24c9d794ff7c63d67c463043f96ae3b)
+++ tests/exceptions/cancel/thread.cfa	(revision f02f546a0bb9f23075f612531e3b22bef6122da8)
@@ -2,8 +2,7 @@
 
 #include <thread.hfa>
-#include <exception.hfa>
 
-EHM_EXCEPTION(internal_error)();
-EHM_VIRTUAL_TABLE(internal_error, internal_vt);
+exception internal_error {};
+vtable(internal_error) internal_vt;
 
 thread WillCancel {};