diff --git a/packages/scenes/src/querying/SceneDataTransformer.test.ts b/packages/scenes/src/querying/SceneDataTransformer.test.ts
index 2e0343ad2..8d10b4df4 100644
--- a/packages/scenes/src/querying/SceneDataTransformer.test.ts
+++ b/packages/scenes/src/querying/SceneDataTransformer.test.ts
@@ -543,9 +543,9 @@ describe('SceneDataTransformer', () => {
 
     const data = stateUpdates[0].data;
     // Verify series are transformed
-    expect(data.series[0].fields[0].values[0]).toBe(10 * 2);
+    expect(data?.series[0].fields[0].values[0]).toBe(10 * 2);
     // Verify annotations are transformed
-    expect(data.annotations[0].fields[0].values[0]).toBe(100 + 4);
+    expect(data?.annotations?.[0].fields[0].values[0]).toBe(100 + 4);
   });
 
   describe('With inner query runner', () => {
@@ -700,7 +700,7 @@ describe('SceneDataTransformer', () => {
       dataNode.setState({ data: { ...dataNode.state.data, state: LoadingState.Loading } });
 
       expect(customTransformerSpy).toHaveBeenCalledTimes(1);
-      expect(transformer.state.data.state).toBe(LoadingState.Loading);
+      expect(transformer.state.data?.state).toBe(LoadingState.Loading);
     });
   });
 });
diff --git a/packages/scenes/src/querying/SceneQueryRunner.test.ts b/packages/scenes/src/querying/SceneQueryRunner.test.ts
index b7b2ce542..c945790f1 100644
--- a/packages/scenes/src/querying/SceneQueryRunner.test.ts
+++ b/packages/scenes/src/querying/SceneQueryRunner.test.ts
@@ -2146,10 +2146,10 @@ describe('SceneQueryRunner', () => {
       const clone = queryRunner.clone();
 
       expect(clone['_resultAnnotations']).not.toBeUndefined();
-      expect(clone['_resultAnnotations'].length).toBe(1);
+      expect(clone['_resultAnnotations']?.length).toBe(1);
       expect(clone['_resultAnnotations']).toStrictEqual(queryRunner['_resultAnnotations']);
       expect(clone['_layerAnnotations']).not.toBeUndefined();
-      expect(clone['_layerAnnotations'].length).toBe(1);
+      expect(clone['_layerAnnotations']?.length).toBe(1);
       expect(clone['_layerAnnotations']).toStrictEqual(queryRunner['_layerAnnotations']);
       expect(clone['_results']['_buffer']).not.toEqual([]);
     });
diff --git a/packages/scenes/src/variables/adhoc/AdHocFiltersVariable.test.tsx b/packages/scenes/src/variables/adhoc/AdHocFiltersVariable.test.tsx
index 87bd7b809..598fa674b 100644
--- a/packages/scenes/src/variables/adhoc/AdHocFiltersVariable.test.tsx
+++ b/packages/scenes/src/variables/adhoc/AdHocFiltersVariable.test.tsx
@@ -143,8 +143,8 @@ describe('AdHocFiltersVariable', () => {
   });
 
   it('Can set a custom value before the list of values returns', async () => {
-    let resolveCallback;
-    const delayingPromise = new Promise((resolve) => (resolveCallback = resolve));
+    let resolveCallback = (v: string) => {};
+    const delayingPromise = new Promise<string>((resolve) => (resolveCallback = resolve));
 
     const { filtersVar, runRequest } = setup({
       getTagValuesProvider: async () => {
@@ -166,7 +166,7 @@ describe('AdHocFiltersVariable', () => {
     await userEvent.type(selects[2], 'myVeryCustomValue');
 
     // resolve the delaying promise
-    await act(resolveCallback);
+    act(() => resolveCallback(''));
 
     await userEvent.type(selects[2], '{enter}');
 
@@ -535,9 +535,7 @@ describe('AdHocFiltersVariable', () => {
       filtersVar._updateFilter(filtersVar.state.filters[0], 'value', { value: '', label: '' });
     });
 
-    expect(locationService.getLocation().search).toBe(
-      '?var-filters=key2%7C%3D%7Cval2'
-    );
+    expect(locationService.getLocation().search).toBe('?var-filters=key2%7C%3D%7Cval2');
   });
 
   it('Can override and replace getTagKeys and getTagValues', async () => {
diff --git a/tsconfig.json b/tsconfig.json
index 89b4d0705..5d0e70111 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@grafana/tsconfig/base.json",
+  "extends": "@grafana/tsconfig/tsconfig.json",
   "compilerOptions": {
     "declaration": true,
     "declarationDir": "./compiled",