diff --git a/integration/bundle/basic_test.go b/integration/bundle/basic_test.go
index 250a66b904..53f8e3ef6e 100644
--- a/integration/bundle/basic_test.go
+++ b/integration/bundle/basic_test.go
@@ -39,7 +39,7 @@ func TestBasicBundleDeployWithFailOnActiveRuns(t *testing.T) {
 }
 
 func TestBasicBundleDeployWithDoubleUnderscoreVariables(t *testing.T) {
-	ctx, _ := acc.WorkspaceTest(t)
+	ctx, wt := acc.WorkspaceTest(t)
 
 	nodeTypeId := testutil.GetCloud(t).NodeTypeID()
 	uniqueId := uuid.New().String()
@@ -49,8 +49,12 @@ func TestBasicBundleDeployWithDoubleUnderscoreVariables(t *testing.T) {
 		"spark_version": defaultSparkVersion,
 	})
 
+	currentUser, err := wt.W.CurrentUser.Me(ctx)
+	require.NoError(t, err)
+
 	ctx, replacements := testdiff.WithReplacementsMap(ctx)
 	replacements.Set(uniqueId, "$UNIQUE_PRJ")
+	replacements.Set(currentUser.UserName, "$USERNAME")
 
 	t.Cleanup(func() {
 		destroyBundle(t, ctx, root)
diff --git a/integration/bundle/testdata/basic_with_variables/bundle_deploy.txt b/integration/bundle/testdata/basic_with_variables/bundle_deploy.txt
index 0490eaa0f0..211164174e 100644
--- a/integration/bundle/testdata/basic_with_variables/bundle_deploy.txt
+++ b/integration/bundle/testdata/basic_with_variables/bundle_deploy.txt
@@ -1,4 +1,4 @@
-Uploading bundle files to /Workspace/Users/5e3ea482-cb45-4da7-b139-b9eef101910e/.bundle/$UNIQUE_PRJ/files...
+Uploading bundle files to /Workspace/Users/$USERNAME/.bundle/$UNIQUE_PRJ/files...
 Deploying resources...
 Updating deployment state...
 Deployment complete!
diff --git a/integration/bundle/testdata/basic_with_variables/bundle_validate.txt b/integration/bundle/testdata/basic_with_variables/bundle_validate.txt
index 6238dabb2d..dc9016a0f9 100644
--- a/integration/bundle/testdata/basic_with_variables/bundle_validate.txt
+++ b/integration/bundle/testdata/basic_with_variables/bundle_validate.txt
@@ -1,7 +1,7 @@
 Name: basic
 Target: default
 Workspace:
-  User: 5e3ea482-cb45-4da7-b139-b9eef101910e
-  Path: /Workspace/Users/5e3ea482-cb45-4da7-b139-b9eef101910e/.bundle/$UNIQUE_PRJ
+  User: $USERNAME
+  Path: /Workspace/Users/$USERNAME/.bundle/$UNIQUE_PRJ
 
 Validation OK!