diff --git a/acceptance/telemetry/test.toml b/acceptance/telemetry/test.toml
index 72458baa9..89fa855e3 100644
--- a/acceptance/telemetry/test.toml
+++ b/acceptance/telemetry/test.toml
@@ -1,5 +1,3 @@
-LocalOnly = true
-RecordRequests = true
 IncludeRequestHeaders = ["Authorization"]
 
 [[Repls]]
diff --git a/acceptance/telemetry/upload-command/out.upload.txt b/acceptance/telemetry/upload-command/out.upload.txt
index 7ee6e3b6a..2fd4e3306 100644
--- a/acceptance/telemetry/upload-command/out.upload.txt
+++ b/acceptance/telemetry/upload-command/out.upload.txt
@@ -1,3 +1,3 @@
 Telemetry logs uploaded successfully
 Response:
-{"errors":null,"numProtoSuccess":2}
+{"errors":[],"numProtoSuccess":2}
diff --git a/acceptance/telemetry/upload-command/test.toml b/acceptance/telemetry/upload-command/test.toml
index 05127c25b..86eb7f716 100644
--- a/acceptance/telemetry/upload-command/test.toml
+++ b/acceptance/telemetry/upload-command/test.toml
@@ -1,7 +1,11 @@
+LocalOnly = true
+RecordRequests = true
+
 [[Server]]
 Pattern = "POST /telemetry-ext"
 Response.Body = '''
 {
+    "errors": [],
     "numProtoSuccess": 2
 }
 '''
diff --git a/acceptance/telemetry/upload-fails/test.toml b/acceptance/telemetry/upload-fails/test.toml
index 92a647272..08ae48ec9 100644
--- a/acceptance/telemetry/upload-fails/test.toml
+++ b/acceptance/telemetry/upload-fails/test.toml
@@ -1,3 +1,6 @@
+LocalOnly = true
+RecordRequests = true
+
 [[Server]]
 Pattern = "POST /telemetry-ext"
 Response.Body = '''
diff --git a/acceptance/telemetry/upload-skipped/test.toml b/acceptance/telemetry/upload-skipped/test.toml
index 05127c25b..86eb7f716 100644
--- a/acceptance/telemetry/upload-skipped/test.toml
+++ b/acceptance/telemetry/upload-skipped/test.toml
@@ -1,7 +1,11 @@
+LocalOnly = true
+RecordRequests = true
+
 [[Server]]
 Pattern = "POST /telemetry-ext"
 Response.Body = '''
 {
+    "errors": [],
     "numProtoSuccess": 2
 }
 '''
diff --git a/acceptance/telemetry/upload-succeeds-integration/out.upload_process.txt b/acceptance/telemetry/upload-succeeds-integration/out.upload_process.txt
new file mode 100644
index 000000000..2fd4e3306
--- /dev/null
+++ b/acceptance/telemetry/upload-succeeds-integration/out.upload_process.txt
@@ -0,0 +1,3 @@
+Telemetry logs uploaded successfully
+Response:
+{"errors":[],"numProtoSuccess":2}
diff --git a/acceptance/telemetry/upload-succeeds-integration/output.txt b/acceptance/telemetry/upload-succeeds-integration/output.txt
new file mode 100644
index 000000000..bf0b22af4
--- /dev/null
+++ b/acceptance/telemetry/upload-succeeds-integration/output.txt
@@ -0,0 +1,5 @@
+
+>>> [CLI] selftest send-telemetry
+waiting for telemetry process to finish
+hello
+[wait_pid] process has ended
diff --git a/acceptance/telemetry/upload-succeeds-integration/script b/acceptance/telemetry/upload-succeeds-integration/script
new file mode 100644
index 000000000..6441a9392
--- /dev/null
+++ b/acceptance/telemetry/upload-succeeds-integration/script
@@ -0,0 +1,14 @@
+export DATABRICKS_CLI_TELEMETRY_PID_FILE=./telemetry.pid
+export DATABRICKS_CLI_TELEMETRY_UPLOAD_LOGS_FILE=./out.upload_process.txt
+
+trace $CLI selftest send-telemetry
+
+echo "waiting for telemetry process to finish"
+
+echo "hello"
+
+# Wait for the child telemetry process to finish
+wait_pid $(cat ./telemetry.pid)
+
+# cleanup the pid file
+rm -f ./telemetry.pid
diff --git a/acceptance/telemetry/upload-succeeds-integration/test.toml b/acceptance/telemetry/upload-succeeds-integration/test.toml
new file mode 100644
index 000000000..f017af6e9
--- /dev/null
+++ b/acceptance/telemetry/upload-succeeds-integration/test.toml
@@ -0,0 +1,16 @@
+# RecordRequests is not supported for integration tests yet. Once we have support
+# for running integration tests with record requests we can remove this test since
+# it's a copy of acceptance/telemetry/upload-succeeds.
+
+[[Server]]
+Pattern = "POST /telemetry-ext"
+Response.Body = '''
+{
+    "errors": [],
+    "numProtoSuccess": 2
+}
+'''
+
+[[Repls]]
+Old = 'execution_time_ms\\\":\d{1,5},'
+New = 'execution_time_ms\":\"SMALL_INT\",'
diff --git a/acceptance/telemetry/upload-succeeds-oauth/out.upload_process.txt b/acceptance/telemetry/upload-succeeds-oauth/out.upload_process.txt
index 7ee6e3b6a..2fd4e3306 100644
--- a/acceptance/telemetry/upload-succeeds-oauth/out.upload_process.txt
+++ b/acceptance/telemetry/upload-succeeds-oauth/out.upload_process.txt
@@ -1,3 +1,3 @@
 Telemetry logs uploaded successfully
 Response:
-{"errors":null,"numProtoSuccess":2}
+{"errors":[],"numProtoSuccess":2}
diff --git a/acceptance/telemetry/upload-succeeds-oauth/test.toml b/acceptance/telemetry/upload-succeeds-oauth/test.toml
index 0967f23e7..6dc672d1b 100644
--- a/acceptance/telemetry/upload-succeeds-oauth/test.toml
+++ b/acceptance/telemetry/upload-succeeds-oauth/test.toml
@@ -1,7 +1,11 @@
+LocalOnly = true
+RecordRequests = true
+
 [[Server]]
 Pattern = "POST /telemetry-ext"
 Response.Body = '''
 {
+    "errors": [],
     "numProtoSuccess": 2
 }
 '''
diff --git a/acceptance/telemetry/upload-succeeds/out.upload_process.txt b/acceptance/telemetry/upload-succeeds/out.upload_process.txt
index 7ee6e3b6a..2fd4e3306 100644
--- a/acceptance/telemetry/upload-succeeds/out.upload_process.txt
+++ b/acceptance/telemetry/upload-succeeds/out.upload_process.txt
@@ -1,3 +1,3 @@
 Telemetry logs uploaded successfully
 Response:
-{"errors":null,"numProtoSuccess":2}
+{"errors":[],"numProtoSuccess":2}
diff --git a/acceptance/telemetry/upload-succeeds/test.toml b/acceptance/telemetry/upload-succeeds/test.toml
index 4826f42b0..27395a527 100644
--- a/acceptance/telemetry/upload-succeeds/test.toml
+++ b/acceptance/telemetry/upload-succeeds/test.toml
@@ -1,7 +1,11 @@
+LocalOnly = true
+RecordRequests = true
+
 [[Server]]
 Pattern = "POST /telemetry-ext"
 Response.Body = '''
 {
+    "errors": [],
     "numProtoSuccess": 2
 }
 '''
diff --git a/acceptance/telemetry/upload-timeout/test.toml b/acceptance/telemetry/upload-timeout/test.toml
index 4826f42b0..27395a527 100644
--- a/acceptance/telemetry/upload-timeout/test.toml
+++ b/acceptance/telemetry/upload-timeout/test.toml
@@ -1,7 +1,11 @@
+LocalOnly = true
+RecordRequests = true
+
 [[Server]]
 Pattern = "POST /telemetry-ext"
 Response.Body = '''
 {
+    "errors": [],
     "numProtoSuccess": 2
 }
 '''