diff --git a/packages/backend-common/src/setupTests.ts b/packages/backend-common/src/setupTests.ts
index 3fa7cb04b4..a3b2b7e123 100644
--- a/packages/backend-common/src/setupTests.ts
+++ b/packages/backend-common/src/setupTests.ts
@@ -15,3 +15,4 @@
  */
 
 require('jest-fetch-mock').enableMocks();
+export {};
diff --git a/packages/backend/src/index.test.ts b/packages/backend/src/index.test.ts
index b3e2f19771..d18873c1f0 100644
--- a/packages/backend/src/index.test.ts
+++ b/packages/backend/src/index.test.ts
@@ -14,8 +14,11 @@
  * limitations under the License.
  */
 
+import { PluginEnvironment } from './types';
+
 describe('test', () => {
   it('unbreaks the test runner', () => {
-    expect(true).toBeTruthy();
+    const unbreaker = {} as PluginEnvironment;
+    expect(unbreaker).toBeTruthy();
   });
 });
diff --git a/packages/cli/src/index.test.ts b/packages/cli/src/index.test.ts
deleted file mode 100644
index 44f01f05e9..0000000000
--- a/packages/cli/src/index.test.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2020 Spotify AB
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-describe('dummy', () => {
-  it('dummy', () => {
-    expect(1).toBe(1);
-  });
-});
diff --git a/plugins/auth-backend/src/index.test.ts b/plugins/auth-backend/src/index.test.ts
deleted file mode 100644
index b3e2f19771..0000000000
--- a/plugins/auth-backend/src/index.test.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2020 Spotify AB
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-describe('test', () => {
-  it('unbreaks the test runner', () => {
-    expect(true).toBeTruthy();
-  });
-});
diff --git a/plugins/auth-backend/src/setupTests.ts b/plugins/auth-backend/src/setupTests.ts
index 3fa7cb04b4..a3b2b7e123 100644
--- a/plugins/auth-backend/src/setupTests.ts
+++ b/plugins/auth-backend/src/setupTests.ts
@@ -15,3 +15,4 @@
  */
 
 require('jest-fetch-mock').enableMocks();
+export {};
diff --git a/plugins/catalog-backend/src/setupTests.ts b/plugins/catalog-backend/src/setupTests.ts
index 3fa7cb04b4..a3b2b7e123 100644
--- a/plugins/catalog-backend/src/setupTests.ts
+++ b/plugins/catalog-backend/src/setupTests.ts
@@ -15,3 +15,4 @@
  */
 
 require('jest-fetch-mock').enableMocks();
+export {};
diff --git a/plugins/circleci/src/api/index.ts b/plugins/circleci/src/api/index.ts
index 26b0213e3a..64a33e4c13 100644
--- a/plugins/circleci/src/api/index.ts
+++ b/plugins/circleci/src/api/index.ts
@@ -28,7 +28,8 @@ import {
 } from 'circleci-api';
 import { createApiRef } from '@backstage/core';
 
-export { BuildWithSteps, BuildStepAction, BuildSummary, GitType };
+export { GitType };
+export type { BuildWithSteps, BuildStepAction, BuildSummary };
 
 export const circleCIApiRef = createApiRef<CircleCIApi>({
   id: 'plugin.circleci.service',
diff --git a/plugins/identity-backend/src/index.test.ts b/plugins/identity-backend/src/index.test.ts
index b3e2f19771..4fca4ca746 100644
--- a/plugins/identity-backend/src/index.test.ts
+++ b/plugins/identity-backend/src/index.test.ts
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import '@backstage/backend-common';
+
 describe('test', () => {
   it('unbreaks the test runner', () => {
     expect(true).toBeTruthy();
diff --git a/plugins/identity-backend/src/setupTests.ts b/plugins/identity-backend/src/setupTests.ts
index 3fa7cb04b4..a3b2b7e123 100644
--- a/plugins/identity-backend/src/setupTests.ts
+++ b/plugins/identity-backend/src/setupTests.ts
@@ -15,3 +15,4 @@
  */
 
 require('jest-fetch-mock').enableMocks();
+export {};