diff --git a/Tasks/DockerV1/Tests/L0.ts b/Tasks/DockerV1/Tests/L0.ts
index 94927e572308..c9f19b840c47 100644
--- a/Tasks/DockerV1/Tests/L0.ts
+++ b/Tasks/DockerV1/Tests/L0.ts
@@ -411,6 +411,7 @@ describe('Docker Suite', function() {
         let tp = path.join(__dirname, 'TestSetup.js');
         process.env[shared.TestEnvVars.imageName] = "testuser/standardbuild:11";
         process.env[shared.TestEnvVars.command] = shared.CommandTypes.buildImage;
+        process.env[shared.TestEnvVars.addBaseImageData] = "false";
         let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
         tr.run();
 
@@ -426,6 +427,7 @@ describe('Docker Suite', function() {
         let tp = path.join(__dirname, 'TestSetup.js');
         process.env[shared.TestEnvVars.imageName] = "testuser/buildkit:11";
         process.env[shared.TestEnvVars.command] = shared.CommandTypes.buildImage;
+        process.env[shared.TestEnvVars.addBaseImageData] = "false";
         let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
         tr.run();
 
diff --git a/Tasks/DockerV1/Tests/TestSetup.ts b/Tasks/DockerV1/Tests/TestSetup.ts
index f50a902f5993..6a06d9feff27 100644
--- a/Tasks/DockerV1/Tests/TestSetup.ts
+++ b/Tasks/DockerV1/Tests/TestSetup.ts
@@ -156,11 +156,11 @@ a.exec[`docker images`] = {
     "code": 0,
     "stdout": "Listed images successfully."
 };
-a.exec[`docker build -f ${DockerFilePath} -t testuser/standardbuild:11`] = {
+a.exec[`docker build -f ${DockerFilePath} ${shared.DockerCommandArgs.BuildLabels} -t testuser/standardbuild:11`] = {
     "code": 0,
     "stdout": "Successfully built c834e0094587\n Successfully tagged testuser/testrepo:11."
 };
-a.exec[`docker build -f ${DockerFilePath} -t testuser/buildkit:11`] = {
+a.exec[`docker build -f ${DockerFilePath} ${shared.DockerCommandArgs.BuildLabels} -t testuser/buildkit:11`] = {
     "code": 0,
     "stdout": " => => writing image sha256:6c3ada3eb42094510e0083bba6ae805540e36c96871d7be0c926b2f8cbeea68c\n => => naming to docker.io/library/testuser/buildkit:11"
 };