diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 63d3992298..c3e3058bed 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -4,12 +4,15 @@
 // ***********************************************
 
 import { AuthTokenInfo, TOKENITEM } from 'src/app/core/auth/models/auth-token-info.model';
-import { FALLBACK_TEST_REST_BASE_URL } from './e2e';
+
+// NOTE: FALLBACK_TEST_REST_BASE_URL is only used if Cypress cannot read the REST API BaseURL
+// from the Angular UI's config.json. See 'login()'.
+export const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server';
 
 // Declare Cypress namespace to help with Intellisense & code completion in IDEs
 // ALL custom commands MUST be listed here for code completion to work
-// tslint:disable-next-line:no-namespace
 declare global {
+    // eslint-disable-next-line @typescript-eslint/no-namespace
     namespace Cypress {
         interface Chainable<Subject = any> {
             /**
@@ -107,4 +110,4 @@ Cypress.Commands.add('login', login);
     cy.get('ds-log-in [data-test="login-button"]').click();
 }
 // Add as a Cypress command (i.e. assign to 'cy.loginViaForm')
-Cypress.Commands.add('loginViaForm', loginViaForm);
\ No newline at end of file
+Cypress.Commands.add('loginViaForm', loginViaForm);
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index 70da23f044..17950eb629 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -43,10 +43,6 @@ afterEach(() => {
 // https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
 // (This is the data set used in our CI environment)
 
-// NOTE: FALLBACK_TEST_REST_BASE_URL is only used if Cypress cannot read the REST API BaseURL
-// from the Angular UI's config.json. See 'getBaseRESTUrl()' in commands.ts
-export const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server';
-
 // Admin account used for administrative tests
 export const TEST_ADMIN_USER = Cypress.env('DSPACE_TEST_ADMIN_USER') || 'dspacedemo+admin@gmail.com';
 export const TEST_ADMIN_PASSWORD = Cypress.env('DSPACE_TEST_ADMIN_PASSWORD') || 'dspace';