diff --git a/plugins/catalog-graphql/package.json b/plugins/catalog-graphql/package.json
index bb7cc4c45b..8982f0fa5a 100644
--- a/plugins/catalog-graphql/package.json
+++ b/plugins/catalog-graphql/package.json
@@ -49,6 +49,7 @@
     "@graphql-codegen/typescript": "^2.4.2",
     "@graphql-codegen/typescript-resolvers": "^2.4.3",
     "@graphql-codegen/graphql-modules-preset": "^2.3.2",
+    "@graphql-tools/schema": "^8.3.1",
     "eslint-plugin-graphql": "^4.0.0",
     "msw": "^0.35.0"
   },
diff --git a/plugins/catalog-graphql/src/graphql/module.test.ts b/plugins/catalog-graphql/src/graphql/module.test.ts
index f896c64822..605e9d9aed 100644
--- a/plugins/catalog-graphql/src/graphql/module.test.ts
+++ b/plugins/catalog-graphql/src/graphql/module.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { createModule } from './module';
-import { execute } from 'graphql';
+import { makeExecutableSchema } from '@graphql-tools/schema';
 import { rest } from 'msw';
 import { setupServer } from 'msw/node';
 import { ConfigReader } from '@backstage/config';
@@ -23,7 +23,7 @@ import { ReaderEntity } from '../service/client';
 import { createLogger } from 'winston';
 import { setupRequestMockHandlers } from '@backstage/test-utils';
 import { gql } from 'apollo-server';
-import { Module, createApplication } from 'graphql-modules';
+import { Module, createApplication, testkit } from 'graphql-modules';
 
 describe('Catalog Module', () => {
   const worker = setupServer();
@@ -34,9 +34,15 @@ describe('Catalog Module', () => {
     },
   });
 
-  const createSchema = (module: Module) => {
+  const createMockApplication = (module: Module) => {
     const application = createApplication({
       modules: [module],
+      schemaBuilder(input) {
+        return makeExecutableSchema({
+          ...input,
+          inheritResolversFromInterfaces: true,
+        });
+      },
     });
 
     return application;
@@ -68,22 +74,21 @@ describe('Catalog Module', () => {
       ];
 
       worker.use(
-        rest.get(`${mockCatalogBaseUrl}/catalog/entities`, (_, res, ctx) =>
+        rest.get(`${mockCatalogBaseUrl}/api/catalog/entities`, (_, res, ctx) =>
           res(ctx.status(200), ctx.json(mockResponse)),
         ),
       );
     });
 
     it('should call the catalog client when requesting entities', async () => {
-      const { schema } = createSchema(
+      const app = createMockApplication(
         await createModule({
           config: mockConfig,
           logger: createLogger(),
         }),
       );
 
-      const result = await execute({
-        schema,
+      const result = await testkit.execute(app, {
         document: gql`
           query {
             catalog {
@@ -98,7 +103,8 @@ describe('Catalog Module', () => {
           }
         `,
       });
-      const [catalogItem] = (result as any).data?.catalog?.list;
+
+      const [catalogItem] = result.data?.catalog.list;
       expect(catalogItem.kind).toBe('Component');
       expect(catalogItem.apiVersion).toBe('something');
       expect(catalogItem.metadata.name).toBe('Ben');
@@ -126,20 +132,19 @@ describe('Catalog Module', () => {
         },
       ];
       worker.use(
-        rest.get(`${mockCatalogBaseUrl}/catalog/entities`, (_, res, ctx) =>
+        rest.get(`${mockCatalogBaseUrl}/api/catalog/entities`, (_, res, ctx) =>
           res(ctx.status(200), ctx.json(mockResponse)),
         ),
       );
 
-      const { schema } = createSchema(
+      const app = createMockApplication(
         await createModule({
           config: mockConfig,
           logger: createLogger(),
         }),
       );
 
-      const result = await execute({
-        schema,
+      const result = await testkit.execute(app, {
         document: gql`
           query {
             catalog {
@@ -153,7 +158,7 @@ describe('Catalog Module', () => {
         `,
       });
 
-      const [catalogItem] = (result as any).data?.catalog.list;
+      const [catalogItem] = result.data?.catalog.list;
       expect(catalogItem.metadata.annotations).toEqual({});
     });
 
@@ -179,20 +184,19 @@ describe('Catalog Module', () => {
         },
       ];
       worker.use(
-        rest.get(`${mockCatalogBaseUrl}/catalog/entities`, (_, res, ctx) =>
+        rest.get(`${mockCatalogBaseUrl}/api/catalog/entities`, (_, res, ctx) =>
           res(ctx.status(200), ctx.json(mockResponse)),
         ),
       );
 
-      const { schema } = createSchema(
+      const app = createMockApplication(
         await createModule({
           config: mockConfig,
           logger: createLogger(),
         }),
       );
 
-      const result = await execute({
-        schema,
+      const result = await testkit.execute(app, {
         document: gql`
           query {
             catalog {
@@ -206,7 +210,7 @@ describe('Catalog Module', () => {
         `,
       });
 
-      const [catalogItem] = (result as any).data?.catalog.list;
+      const [catalogItem] = result.data?.catalog.list;
       expect(catalogItem.metadata.labels).toEqual({});
     });
     it('Returns the correct record from the annotation dictionary', async () => {
@@ -231,20 +235,19 @@ describe('Catalog Module', () => {
         },
       ];
       worker.use(
-        rest.get(`${mockCatalogBaseUrl}/catalog/entities`, (_, res, ctx) =>
+        rest.get(`${mockCatalogBaseUrl}/api/catalog/entities`, (_, res, ctx) =>
           res(ctx.status(200), ctx.json(mockResponse)),
         ),
       );
 
-      const { schema } = createSchema(
+      const app = createMockApplication(
         await createModule({
           config: mockConfig,
           logger: createLogger(),
         }),
       );
 
-      const result = await execute({
-        schema,
+      const result = await testkit.execute(app, {
         document: gql`
           query {
             catalog {
@@ -258,7 +261,7 @@ describe('Catalog Module', () => {
         `,
       });
 
-      const [catalogItem] = (result as any).data?.catalog.list;
+      const [catalogItem] = result.data?.catalog.list;
       expect(catalogItem.metadata.test).toEqual('bloben');
     });
     it('Returns the correct record from the labels dictionary', async () => {
@@ -283,20 +286,19 @@ describe('Catalog Module', () => {
         },
       ];
       worker.use(
-        rest.get(`${mockCatalogBaseUrl}/catalog/entities`, (_, res, ctx) =>
+        rest.get(`${mockCatalogBaseUrl}/api/catalog/entities`, (_, res, ctx) =>
           res(ctx.status(200), ctx.json(mockResponse)),
         ),
       );
 
-      const { schema } = createSchema(
+      const app = createMockApplication(
         await createModule({
           config: mockConfig,
           logger: createLogger(),
         }),
       );
 
-      const result = await execute({
-        schema,
+      const result = await testkit.execute(app, {
         document: gql`
           query {
             catalog {
@@ -310,7 +312,7 @@ describe('Catalog Module', () => {
         `,
       });
 
-      const [catalogItem] = (result as any).data?.catalog.list;
+      const [catalogItem] = result.data?.catalog.list;
       expect(catalogItem.metadata.test).toEqual('bloben');
     });
   });
diff --git a/plugins/catalog-graphql/src/service/client.test.ts b/plugins/catalog-graphql/src/service/client.test.ts
index 8d674a6814..72041725a3 100644
--- a/plugins/catalog-graphql/src/service/client.test.ts
+++ b/plugins/catalog-graphql/src/service/client.test.ts
@@ -28,7 +28,7 @@ describe('Catalog GraphQL Module', () => {
     const expectedResponse = [{ id: 'something' }];
 
     worker.use(
-      rest.get(`${baseUrl}/catalog/entities`, (_, res, ctx) =>
+      rest.get(`${baseUrl}/api/catalog/entities`, (_, res, ctx) =>
         res(ctx.status(200), ctx.json(expectedResponse)),
       ),
     );
@@ -44,7 +44,7 @@ describe('Catalog GraphQL Module', () => {
     const expectedResponse = 'something broke';
 
     worker.use(
-      rest.get(`${baseUrl}/catalog/entities`, (_, res, ctx) =>
+      rest.get(`${baseUrl}/api/catalog/entities`, (_, res, ctx) =>
         res(ctx.status(500), ctx.text(expectedResponse)),
       ),
     );