diff --git a/TestServer/API/Main.ts b/TestServer/API/Main.ts
index 177652e48d..3dfbd9b77f 100644
--- a/TestServer/API/Main.ts
+++ b/TestServer/API/Main.ts
@@ -9,6 +9,7 @@ import Response from 'CommonServer/Utils/Response';
 import Sleep from 'Common/Types/Sleep';
 import Typeof from 'Common/Types/Typeof';
 import { JSONValue } from 'Common/Types/JSON';
+import logger from 'CommonServer/Utils/Logger';
 
 const router: ExpressRouter = Express.getRouter();
 
@@ -20,6 +21,12 @@ router.get(
         next: NextFunction
     ): Promise<void> => {
         try {
+
+            logger.info('Request Headers: ');
+            logger.info(req.headers);
+            logger.info('Request Body: ');
+            logger.info(req.body);
+
             const responseCode: number | undefined =
                 LocalCache.getNumber('TestServer', 'responseCode') || 200;
             const responseTime: number | undefined =
@@ -29,6 +36,13 @@ router.get(
             let responseHeaders: JSONValue | undefined =
                 LocalCache.getJSON('TestServer', 'responseHeaders') || {};
 
+            logger.info('Response Code: ' + responseCode);
+            logger.info('Response Time: ' + responseTime);
+            logger.info('Response Body: ');
+            logger.info(responseBody);
+            logger.info('Response Headers: ');
+            logger.info(responseHeaders);
+
             if (responseHeaders && typeof responseHeaders === Typeof.String) {
                 responseHeaders = JSON.parse(responseHeaders.toString());
             }
diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index ae43b2026a..595794c9d0 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -208,6 +208,15 @@ services:
             
         
 
+    test-server:
+        networks:
+          - oneuptime
+        restart: always
+        environment: 
+            <<: *common-server-variables
+            PORT: ${TEST_SERVER_PORT}
+            
+
     dashboard-api:
         networks:
           - oneuptime
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index afd28ed6cf..53686f7220 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -140,7 +140,32 @@ services:
             context: .
             dockerfile: ./StatusPage/Dockerfile
             
-        
+    
+    test-server:
+        volumes:
+            - ./TestServer:/usr/src/app
+            # Use node modules of the container and not host system.
+            # https://stackoverflow.com/questions/29181032/add-a-volume-to-docker-but-exclude-a-sub-folder
+            - /usr/src/app/node_modules/
+            - ./Common:/usr/src/Common
+            - ./Model:/usr/src/Model
+            - ./CommonServer:/usr/src/CommonServer
+            - ./CommonUI:/usr/src/CommonUI
+            - /usr/src/Common/node_modules/
+            - /usr/src/CommonUI/node_modules/
+            - /usr/src/CommonServer/node_modules/
+            - /usr/src/Model/node_modules/
+        extends:
+            file: ./docker-compose.base.yml
+            service: test-server
+        ports:
+            - '9141:9229' # Debugging port.
+            - '3800:3800'
+        build:
+            network: host
+            context: .
+            dockerfile: ./TestServer/Dockerfile
+
 
     dashboard-api:
         volumes: