diff --git a/src/sql/base/test/parts/editableDropdown/browser/dropdown.test.ts b/src/sql/base/test/browser/ui/editableDropdown/dropdown.test.ts
similarity index 100%
rename from src/sql/base/test/parts/editableDropdown/browser/dropdown.test.ts
rename to src/sql/base/test/browser/ui/editableDropdown/dropdown.test.ts
diff --git a/src/sql/workbench/test/electron-browser/api/extHostAccountManagement.test.ts b/src/sql/workbench/api/test/browser/extHostAccountManagement.test.ts
similarity index 100%
rename from src/sql/workbench/test/electron-browser/api/extHostAccountManagement.test.ts
rename to src/sql/workbench/api/test/browser/extHostAccountManagement.test.ts
diff --git a/src/sql/workbench/test/electron-browser/api/extHostBackgroundTaskManagement.test.ts b/src/sql/workbench/api/test/browser/extHostBackgroundTaskManagement.test.ts
similarity index 100%
rename from src/sql/workbench/test/electron-browser/api/extHostBackgroundTaskManagement.test.ts
rename to src/sql/workbench/api/test/browser/extHostBackgroundTaskManagement.test.ts
diff --git a/src/sql/workbench/test/electron-browser/api/extHostCredentialManagement.test.ts b/src/sql/workbench/api/test/browser/extHostCredentialManagement.test.ts
similarity index 100%
rename from src/sql/workbench/test/electron-browser/api/extHostCredentialManagement.test.ts
rename to src/sql/workbench/api/test/browser/extHostCredentialManagement.test.ts
diff --git a/src/sql/workbench/test/electron-browser/api/extHostDataProtocol.test.ts b/src/sql/workbench/api/test/browser/extHostDataProtocol.test.ts
similarity index 100%
rename from src/sql/workbench/test/electron-browser/api/extHostDataProtocol.test.ts
rename to src/sql/workbench/api/test/browser/extHostDataProtocol.test.ts
diff --git a/src/sql/workbench/test/electron-browser/api/extHostModelView.test.ts b/src/sql/workbench/api/test/browser/extHostModelView.test.ts
similarity index 100%
rename from src/sql/workbench/test/electron-browser/api/extHostModelView.test.ts
rename to src/sql/workbench/api/test/browser/extHostModelView.test.ts
diff --git a/src/sql/workbench/test/electron-browser/api/extHostModelViewDialog.test.ts b/src/sql/workbench/api/test/browser/extHostModelViewDialog.test.ts
similarity index 100%
rename from src/sql/workbench/test/electron-browser/api/extHostModelViewDialog.test.ts
rename to src/sql/workbench/api/test/browser/extHostModelViewDialog.test.ts
diff --git a/src/sql/workbench/test/electron-browser/api/extHostObjectExplorer.test.ts b/src/sql/workbench/api/test/browser/extHostObjectExplorer.test.ts
similarity index 100%
rename from src/sql/workbench/test/electron-browser/api/extHostObjectExplorer.test.ts
rename to src/sql/workbench/api/test/browser/extHostObjectExplorer.test.ts
diff --git a/src/sql/workbench/test/electron-browser/api/exthostNotebook.test.ts b/src/sql/workbench/api/test/browser/exthostNotebook.test.ts
similarity index 100%
rename from src/sql/workbench/test/electron-browser/api/exthostNotebook.test.ts
rename to src/sql/workbench/api/test/browser/exthostNotebook.test.ts
diff --git a/src/sql/workbench/test/electron-browser/api/mainThreadBackgroundTaskManagement.test.ts b/src/sql/workbench/api/test/browser/mainThreadBackgroundTaskManagement.test.ts
similarity index 100%
rename from src/sql/workbench/test/electron-browser/api/mainThreadBackgroundTaskManagement.test.ts
rename to src/sql/workbench/api/test/browser/mainThreadBackgroundTaskManagement.test.ts
diff --git a/src/sql/workbench/test/electron-browser/api/mainThreadModelViewDialog.test.ts b/src/sql/workbench/api/test/browser/mainThreadModelViewDialog.test.ts
similarity index 100%
rename from src/sql/workbench/test/electron-browser/api/mainThreadModelViewDialog.test.ts
rename to src/sql/workbench/api/test/browser/mainThreadModelViewDialog.test.ts
diff --git a/src/sql/workbench/test/electron-browser/api/mainThreadNotebook.test.ts b/src/sql/workbench/api/test/browser/mainThreadNotebook.test.ts
similarity index 100%
rename from src/sql/workbench/test/electron-browser/api/mainThreadNotebook.test.ts
rename to src/sql/workbench/api/test/browser/mainThreadNotebook.test.ts