diff --git a/packages/grafana-toolkit/src/e2e/login.ts b/packages/grafana-toolkit/src/e2e/login.ts
index 3130a452896..e21c4aaf572 100644
--- a/packages/grafana-toolkit/src/e2e/login.ts
+++ b/packages/grafana-toolkit/src/e2e/login.ts
@@ -7,9 +7,9 @@ export const login = async (page: Page) => {
   await loginPage.init(page);
   await loginPage.navigateTo();
 
-  await loginPage.pageObjects!.username.enter('admin');
-  await loginPage.pageObjects!.password.enter('admin');
-  await loginPage.pageObjects!.submit.click();
+  await loginPage.pageObjects.username.enter('admin');
+  await loginPage.pageObjects.password.enter('admin');
+  await loginPage.pageObjects.submit.click();
   await loginPage.waitForResponse();
 };
 
diff --git a/packages/grafana-toolkit/src/e2e/pageInfo.ts b/packages/grafana-toolkit/src/e2e/pageInfo.ts
index c7b7031a50a..f60f8f266c2 100644
--- a/packages/grafana-toolkit/src/e2e/pageInfo.ts
+++ b/packages/grafana-toolkit/src/e2e/pageInfo.ts
@@ -25,11 +25,11 @@ type PageObjects<T> = { [P in keyof T]: T[P] };
 
 export interface TestPageConfig<T> {
   url?: string;
-  pageObjects?: PageObjects<T>;
+  pageObjects: PageObjects<T>;
 }
 
 export class TestPage<T> implements TestPageType<T> {
-  pageObjects?: PageObjects<T>;
+  pageObjects: PageObjects<T>;
   private page?: Page;
   private pageUrl?: string;
 
diff --git a/public/e2e-test/pages/datasources/dataSources.ts b/public/e2e-test/pages/datasources/dataSources.ts
index b76625e1c1c..b52560b13af 100644
--- a/public/e2e-test/pages/datasources/dataSources.ts
+++ b/public/e2e-test/pages/datasources/dataSources.ts
@@ -4,4 +4,5 @@ export interface DataSourcesPage {}
 
 export const dataSourcesPage = new TestPage<DataSourcesPage>({
   url: '/datasources',
+  pageObjects: {},
 });