diff --git a/sdk/src/query-failure-classification.test.ts b/sdk/src/query-failure-classification.test.ts
index 5f3774c74..8c1a52459 100644
--- a/sdk/src/query-failure-classification.test.ts
+++ b/sdk/src/query-failure-classification.test.ts
@@ -21,9 +21,7 @@ describe('query failure classification', () => {
   });
 
   it('prefers typed classification from GSDToolsError', () => {
-    const err = new GSDToolsError('x', 'state', ['load'], null, '', {
-      classification: { kind: 'timeout', timeoutMs: 2000 },
-    });
+    const err = GSDToolsError.timeout('x', 'state', ['load'], '', 2000);
     expect(toFailureSignal(err)).toEqual({ kind: 'timeout', message: 'x', timeoutMs: 2000 });
   });
 });
diff --git a/sdk/src/query-native-direct-adapter.test.ts b/sdk/src/query-native-direct-adapter.test.ts
index aa06edf08..a8dd2c5b9 100644
--- a/sdk/src/query-native-direct-adapter.test.ts
+++ b/sdk/src/query-native-direct-adapter.test.ts
@@ -14,7 +14,7 @@ describe('QueryNativeDirectAdapter', () => {
     });
 
     await expect(adapter.dispatchJson('state', ['load'], 'state.load', [])).rejects.toMatchObject({
-      classification: { kind: 'failure' },
+      classification: GSDToolsError.failure('x', 'state', ['load'], 1).classification,
       command: 'state',
     });
   });
diff --git a/sdk/src/query/query-dispatch-error-mapper.test.ts b/sdk/src/query/query-dispatch-error-mapper.test.ts
index 24a47c0cf..b4fe8beb5 100644
--- a/sdk/src/query/query-dispatch-error-mapper.test.ts
+++ b/sdk/src/query/query-dispatch-error-mapper.test.ts
@@ -27,9 +27,7 @@ describe('query dispatch error mapper', () => {
 
   it('maps typed timeout classification from GSDToolsError', () => {
     const err = mapNativeDispatchError(
-      new GSDToolsError('timeout', 'state', ['load'], null, '', {
-        classification: { kind: 'timeout', timeoutMs: 1234 },
-      }),
+      GSDToolsError.timeout('timeout', 'state', ['load'], '', 1234),
       'state.load',
       [],
     );
@@ -39,9 +37,7 @@ describe('query dispatch error mapper', () => {
 
   it('maps typed failure classification from GSDToolsError', () => {
     const err = mapNativeDispatchError(
-      new GSDToolsError('boom', 'state', ['load'], 1, '', {
-        classification: { kind: 'failure' },
-      }),
+      GSDToolsError.failure('boom', 'state', ['load'], 1),
       'state.load',
       [],
     );