diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index b06a165215..0060777491 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -38,13 +38,14 @@
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.25",
     "@backstage/dev-utils": "^0.1.1-alpha.25",
+    "@backstage/test-utils": "^0.1.1-alpha.25",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^10.4.1",
     "@testing-library/user-event": "^12.0.7",
     "@types/jest": "^26.0.7",
     "@types/node": "^12.0.0",
-    "msw": "^0.21.2",
-    "cross-fetch": "^3.0.6"
+    "cross-fetch": "^3.0.6",
+    "msw": "^0.21.2"
   },
   "files": [
     "dist"
diff --git a/plugins/sentry/src/components/SentryPluginPage/SentryPluginPage.test.tsx b/plugins/sentry/src/components/SentryPluginPage/SentryPluginPage.test.tsx
index d508ddf7c2..21c21ce385 100644
--- a/plugins/sentry/src/components/SentryPluginPage/SentryPluginPage.test.tsx
+++ b/plugins/sentry/src/components/SentryPluginPage/SentryPluginPage.test.tsx
@@ -16,10 +16,13 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
-import mockFetch from 'jest-fetch-mock';
 import SentryPluginPage from './SentryPluginPage';
 import { ThemeProvider } from '@material-ui/core';
 import { lightTheme } from '@backstage/theme';
+import { msw } from '@backstage/test-utils';
+import { setupServer } from 'msw/node';
+import { rest } from 'msw';
+
 import {
   ApiProvider,
   ApiRegistry,
@@ -31,8 +34,11 @@ const errorApi = { post: () => {} };
 const ConfigApi = { getString: () => 'test' };
 
 describe('SentryPluginPage', () => {
+  const server = setupServer();
+  msw.setupDefaultHandlers(server);
+
   it('should render header and time switched', () => {
-    mockFetch.mockResponse('{}');
+    server.use(rest.get('/', (_req, res, ctx) => res(ctx.json({}))));
     const rendered = render(
       <ApiProvider
         apis={ApiRegistry.from([
diff --git a/plugins/techdocs-backend/src/service/router.ts b/plugins/techdocs-backend/src/service/router.ts
index 998a4808cf..b6f8865a57 100644
--- a/plugins/techdocs-backend/src/service/router.ts
+++ b/plugins/techdocs-backend/src/service/router.ts
@@ -111,7 +111,9 @@ export async function createRouter({
 
     const catalogRes = await fetch(`${catalogUrl}/entities/by-name/${triple}`);
     if (!catalogRes.ok) {
-      catalogRes.body.pipe(res.status(catalogRes.status));
+      const catalogResText = await catalogRes.text();
+      res.status(catalogRes.status);
+      res.send(catalogResText);
       return;
     }