diff --git a/test/config/test.js b/test/config/test.js
index 024b58472..a90dc3d78 100644
--- a/test/config/test.js
+++ b/test/config/test.js
@@ -3,10 +3,10 @@
  * Defaults set from default.js
  */
 
-const port = 3000;
+const port = 7337;
 const NODE_ENV = process.env.NODE_ENV;
 module.exports = {
-  port: 3000,
+  port,
   enableFileLogs: false,
   // Console logs are set to avoid the winston error of no defined transports
   enableConsoleLogs: true,
diff --git a/test/utils/github.js b/test/utils/github.js
index 62dbafdeb..3b0c61c0d 100644
--- a/test/utils/github.js
+++ b/test/utils/github.js
@@ -1,9 +1,10 @@
 const defaultClientId = config.get("githubOauth.clientId");
+const baseURL = config.get("services.rdsApi.baseUrl");
 
 const generateGithubAuthRedirectUrl = function ({
   baseUrl = "https://github.com/login/oauth/authorize",
   responseType = "code",
-  redirectUri = "http://localhost:3000/auth/github/callback",
+  redirectUri = `${baseURL}/auth/github/callback`,
   scope = "user:email",
   state = "",
   clientId = defaultClientId,