diff --git a/acceptance/auth/basic/out.requests.txt b/acceptance/auth/credentials/basic/out.requests.txt
similarity index 100%
rename from acceptance/auth/basic/out.requests.txt
rename to acceptance/auth/credentials/basic/out.requests.txt
diff --git a/acceptance/auth/basic/output.txt b/acceptance/auth/credentials/basic/output.txt
similarity index 100%
rename from acceptance/auth/basic/output.txt
rename to acceptance/auth/credentials/basic/output.txt
diff --git a/acceptance/auth/basic/script b/acceptance/auth/credentials/basic/script
similarity index 64%
rename from acceptance/auth/basic/script
rename to acceptance/auth/credentials/basic/script
index aae249083..9c10eca0b 100644
--- a/acceptance/auth/basic/script
+++ b/acceptance/auth/credentials/basic/script
@@ -2,6 +2,7 @@
 # in acceptance tests
 export DATABRICKS_TOKEN=""
 
+# "username:password" in base64 is dXNlcm5hbWU6cGFzc3dvcmQ=, expect to see this in Authorization header
 export DATABRICKS_USERNAME=username
 export DATABRICKS_PASSWORD=password
 
diff --git a/acceptance/auth/oauth/out.requests.txt b/acceptance/auth/credentials/oauth/out.requests.txt
similarity index 100%
rename from acceptance/auth/oauth/out.requests.txt
rename to acceptance/auth/credentials/oauth/out.requests.txt
diff --git a/acceptance/auth/oauth/output.txt b/acceptance/auth/credentials/oauth/output.txt
similarity index 100%
rename from acceptance/auth/oauth/output.txt
rename to acceptance/auth/credentials/oauth/output.txt
diff --git a/acceptance/auth/oauth/script b/acceptance/auth/credentials/oauth/script
similarity index 63%
rename from acceptance/auth/oauth/script
rename to acceptance/auth/credentials/oauth/script
index e4519e41b..4abab8af7 100644
--- a/acceptance/auth/oauth/script
+++ b/acceptance/auth/credentials/oauth/script
@@ -2,6 +2,8 @@
 # in acceptance tests
 export DATABRICKS_TOKEN=""
 
+# "client_id:client_secret" in base64 is Y2xpZW50X2lkOmNsaWVudF9zZWNyZXQ=, expect to
+# see this in Authorization header
 export DATABRICKS_CLIENT_ID=client_id
 export DATABRICKS_CLIENT_SECRET=client_secret
 
diff --git a/acceptance/auth/pat/out.requests.txt b/acceptance/auth/credentials/pat/out.requests.txt
similarity index 100%
rename from acceptance/auth/pat/out.requests.txt
rename to acceptance/auth/credentials/pat/out.requests.txt
diff --git a/acceptance/auth/pat/output.txt b/acceptance/auth/credentials/pat/output.txt
similarity index 100%
rename from acceptance/auth/pat/output.txt
rename to acceptance/auth/credentials/pat/output.txt
diff --git a/acceptance/auth/pat/script b/acceptance/auth/credentials/pat/script
similarity index 100%
rename from acceptance/auth/pat/script
rename to acceptance/auth/credentials/pat/script
diff --git a/acceptance/auth/basic/test.toml b/acceptance/auth/credentials/test.toml
similarity index 100%
rename from acceptance/auth/basic/test.toml
rename to acceptance/auth/credentials/test.toml
diff --git a/acceptance/auth/oauth/test.toml b/acceptance/auth/oauth/test.toml
deleted file mode 100644
index 89438f43a..000000000
--- a/acceptance/auth/oauth/test.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-LocalOnly = true
-
-RecordRequests = true
-IncludeRequestHeaders = ["Authorization", "User-Agent"]
-
-[[Repls]]
-Old = '(linux|darwin|windows)'
-New = '[OS]'
-
-[[Repls]]
-Old = " upstream/[A-Za-z0-9.-]+"
-New = ""
-
-[[Repls]]
-Old = " upstream-version/[A-Za-z0-9.-]+"
-New = ""
-
-[[Repls]]
-Old = " cicd/[A-Za-z0-9.-]+"
-New = ""
diff --git a/acceptance/auth/pat/test.toml b/acceptance/auth/pat/test.toml
deleted file mode 100644
index 89438f43a..000000000
--- a/acceptance/auth/pat/test.toml
+++ /dev/null
@@ -1,20 +0,0 @@
-LocalOnly = true
-
-RecordRequests = true
-IncludeRequestHeaders = ["Authorization", "User-Agent"]
-
-[[Repls]]
-Old = '(linux|darwin|windows)'
-New = '[OS]'
-
-[[Repls]]
-Old = " upstream/[A-Za-z0-9.-]+"
-New = ""
-
-[[Repls]]
-Old = " upstream-version/[A-Za-z0-9.-]+"
-New = ""
-
-[[Repls]]
-Old = " cicd/[A-Za-z0-9.-]+"
-New = ""