diff --git a/packages/dashboard-frontend/src/components/TextFileUpload/Preview/__tests__/__snapshots__/index.spec.tsx.snap b/packages/dashboard-frontend/src/components/TextFileUpload/Preview/__tests__/__snapshots__/index.spec.tsx.snap
index 9c4d95306..92a9bed52 100644
--- a/packages/dashboard-frontend/src/components/TextFileUpload/Preview/__tests__/__snapshots__/index.spec.tsx.snap
+++ b/packages/dashboard-frontend/src/components/TextFileUpload/Preview/__tests__/__snapshots__/index.spec.tsx.snap
@@ -28,11 +28,6 @@ exports[`TextFileUploadPreview snapshot 1`] = `
     />
   </svg>
   Uploaded 
-  <span
-    className={null}
-    style={{}}
-  >
-    12 bytes
-  </span>
+  12bytes
 </div>
 `;
diff --git a/packages/dashboard-frontend/src/components/TextFileUpload/Preview/index.tsx b/packages/dashboard-frontend/src/components/TextFileUpload/Preview/index.tsx
index 2c4df4d7a..551af90d8 100644
--- a/packages/dashboard-frontend/src/components/TextFileUpload/Preview/index.tsx
+++ b/packages/dashboard-frontend/src/components/TextFileUpload/Preview/index.tsx
@@ -25,7 +25,7 @@ export class TextFileUploadPreview extends React.PureComponent<Props> {
       return <></>;
     }
 
-    const numberOfBytes = file.size + (file.size === 1 ? 'byte' : 'bytes');
+    const numberOfBytes = file.size + (file.size === 1 ? ' byte' : ' bytes');
 
     return (
       <div
diff --git a/packages/dashboard-frontend/src/components/WorkspaceEvents/__tests__/__snapshots__/index.spec.tsx.snap b/packages/dashboard-frontend/src/components/WorkspaceEvents/__tests__/__snapshots__/index.spec.tsx.snap
index 19603a235..949c11064 100644
--- a/packages/dashboard-frontend/src/components/WorkspaceEvents/__tests__/__snapshots__/index.spec.tsx.snap
+++ b/packages/dashboard-frontend/src/components/WorkspaceEvents/__tests__/__snapshots__/index.spec.tsx.snap
@@ -87,10 +87,7 @@ exports[`The WorkspaceEvents component snapshot - no events 1`] = `
               data-pf-content={true}
             >
               Showing 
-              <span
-                className={null}
-                style={{}}
-              >
+              <span>
                 0 events
               </span>
             </small>
@@ -163,10 +160,7 @@ exports[`The WorkspaceEvents component snapshot - with events 1`] = `
               data-pf-content={true}
             >
               Showing 
-              <span
-                className={null}
-                style={{}}
-              >
+              <span>
                 2 events
               </span>
             </small>
diff --git a/packages/dashboard-frontend/src/components/WorkspaceEvents/index.tsx b/packages/dashboard-frontend/src/components/WorkspaceEvents/index.tsx
index 7dca48592..7a8d99a34 100644
--- a/packages/dashboard-frontend/src/components/WorkspaceEvents/index.tsx
+++ b/packages/dashboard-frontend/src/components/WorkspaceEvents/index.tsx
@@ -96,7 +96,7 @@ class WorkspaceEvents extends React.PureComponent<Props> {
     const events = this.props.eventsFromResourceVersionFn(startResourceVersion);
     const eventItems = this.getEventItems(events);
 
-    const numberOfEvents = eventItems.length + (eventItems.length === 1 ? ' event' : ' events');
+    const numberOfEvents = <span>{eventItems.length + (eventItems.length === 1 ? ' event' : ' events')}</span>;
 
     const tailStackItem = (
       <StackItem>
diff --git a/packages/dashboard-frontend/src/pages/GetStarted/SamplesList/Toolbar/index.tsx b/packages/dashboard-frontend/src/pages/GetStarted/SamplesList/Toolbar/index.tsx
index 3a9436fec..72ac46f97 100644
--- a/packages/dashboard-frontend/src/pages/GetStarted/SamplesList/Toolbar/index.tsx
+++ b/packages/dashboard-frontend/src/pages/GetStarted/SamplesList/Toolbar/index.tsx
@@ -39,11 +39,10 @@ class SamplesListToolbar extends React.PureComponent<Props> {
     }
 
     if (foundCount === 0) {
-      return <>Nothing found</>;
+      return <span>Nothing found</span>;
     }
 
-    const numberOfItems = foundCount + (foundCount === 1 ? 'item' : 'items');
-    return <>{numberOfItems}</>;
+    return <span>{foundCount + (foundCount === 1 ? ' item' : ' items')}</span>;
   }
 
   render(): React.ReactElement {