diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts
index f011f52b334..60b2fee80a0 100644
--- a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts
+++ b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts
@@ -32,7 +32,6 @@ import { HarnessLoader } from '@angular/cdk/testing';
 import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
 import { Component, CUSTOM_ELEMENTS_SCHEMA, QueryList, SimpleChange, SimpleChanges, ViewChild } from '@angular/core';
 import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { MatDialog } from '@angular/material/dialog';
 import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing';
 import { By } from '@angular/platform-browser';
 import { of, Subject, throwError } from 'rxjs';
@@ -60,14 +59,10 @@ import { ShareDataTableAdapter } from '../data/share-datatable-adapter';
 import { DocumentListModule } from '../document-list.module';
 import { ContentActionModel } from '../models/content-action.model';
 import { DocumentLoaderNode } from '../models/document-folder.model';
-import { matIconRegistryMock } from '../../testing/mat-icon-registry-mock';
-import { domSanitizerMock } from '../../testing/dom-sanitizer-mock';
 import { MatDialog } from '@angular/material/dialog';
 import { FileAutoDownloadComponent } from './file-auto-download/file-auto-download.component';
-import { ShareDataTableAdapter } from '../data/share-datatable-adapter';
-import { HarnessLoader } from '@angular/cdk/testing';
-import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
-import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing';
+import { DocumentListComponent } from './document-list.component';
+import { CustomResourcesService, DocumentListService } from '../public-api';
 
 const mockDialog = {
     open: jasmine.createSpy('open')
diff --git a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts
index b74be6282db..b4ffba61619 100644
--- a/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts
+++ b/lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts
@@ -34,6 +34,7 @@ import {
     TranslationService,
     ViewUtilService,
     ViewerComponent,
+    ViewerModule,
     ViewerSidebarComponent
 } from '@alfresco/adf-core';
 import { NodesApiService } from '../../common/services/nodes-api.service';
@@ -157,15 +158,15 @@ describe('AlfrescoViewerComponent', () => {
                 MatButtonModule,
                 MatIconModule,
                 MatDialogModule,
-                HttpClientTestingModule
+                HttpClientTestingModule,
+                ViewerModule
             ],
             declarations: [
                 ViewerWithCustomToolbarComponent,
                 ViewerWithCustomSidebarComponent,
                 ViewerWithCustomOpenWithComponent,
                 ViewerWithCustomMoreActionsComponent,
-                ViewerWithCustomToolbarActionsComponent,
-                ViewerSidebarComponent
+                ViewerWithCustomToolbarActionsComponent
             ],
             providers: [
                 ContentService,
@@ -179,7 +180,8 @@ describe('AlfrescoViewerComponent', () => {
                     }
                 },
                 { provide: Location, useClass: SpyLocation },
-                MatDialog
+                MatDialog,
+                ViewerSidebarComponent
             ],
             schemas: [CUSTOM_ELEMENTS_SCHEMA]
         });