diff --git a/tests/api/clearState.test.ts b/devenv/e2e-api-tests/clearState.test.ts
similarity index 100%
rename from tests/api/clearState.test.ts
rename to devenv/e2e-api-tests/clearState.test.ts
diff --git a/tests/api/client.ts b/devenv/e2e-api-tests/client.ts
similarity index 100%
rename from tests/api/client.ts
rename to devenv/e2e-api-tests/client.ts
diff --git a/tests/api/dashboard.test.ts b/devenv/e2e-api-tests/dashboard.test.ts
similarity index 100%
rename from tests/api/dashboard.test.ts
rename to devenv/e2e-api-tests/dashboard.test.ts
diff --git a/tests/api/folder.test.ts b/devenv/e2e-api-tests/folder.test.ts
similarity index 100%
rename from tests/api/folder.test.ts
rename to devenv/e2e-api-tests/folder.test.ts
diff --git a/tests/api/jest.js b/devenv/e2e-api-tests/jest.js
similarity index 100%
rename from tests/api/jest.js
rename to devenv/e2e-api-tests/jest.js
diff --git a/tests/api/search.test.ts b/devenv/e2e-api-tests/search.test.ts
similarity index 100%
rename from tests/api/search.test.ts
rename to devenv/e2e-api-tests/search.test.ts
diff --git a/tests/api/setup.ts b/devenv/e2e-api-tests/setup.ts
similarity index 100%
rename from tests/api/setup.ts
rename to devenv/e2e-api-tests/setup.ts
diff --git a/tests/api/tsconfig.json b/devenv/e2e-api-tests/tsconfig.json
similarity index 100%
rename from tests/api/tsconfig.json
rename to devenv/e2e-api-tests/tsconfig.json
diff --git a/tests/api/user.test.ts b/devenv/e2e-api-tests/user.test.ts
similarity index 100%
rename from tests/api/user.test.ts
rename to devenv/e2e-api-tests/user.test.ts
diff --git a/pkg/setting/setting_test.go b/pkg/setting/setting_test.go
index affb3c3e7ca..9b19b6c6bfa 100644
--- a/pkg/setting/setting_test.go
+++ b/pkg/setting/setting_test.go
@@ -97,7 +97,7 @@ func TestLoadingSettings(t *testing.T) {
 				Args: []string{
 					"cfg:default.server.domain=test2",
 				},
-				Config: filepath.Join(HomePath, "tests/config-files/override.ini"),
+				Config: filepath.Join(HomePath, "pkg/setting/testdata/override.ini"),
 			})
 
 			So(Domain, ShouldEqual, "test2")
@@ -108,7 +108,7 @@ func TestLoadingSettings(t *testing.T) {
 				cfg := NewCfg()
 				cfg.Load(&CommandLineArgs{
 					HomePath: "../../",
-					Config:   filepath.Join(HomePath, "tests/config-files/override_windows.ini"),
+					Config:   filepath.Join(HomePath, "pkg/setting/testdata/override_windows.ini"),
 					Args:     []string{`cfg:default.paths.data=c:\tmp\data`},
 				})
 
@@ -117,7 +117,7 @@ func TestLoadingSettings(t *testing.T) {
 				cfg := NewCfg()
 				cfg.Load(&CommandLineArgs{
 					HomePath: "../../",
-					Config:   filepath.Join(HomePath, "tests/config-files/override.ini"),
+					Config:   filepath.Join(HomePath, "pkg/setting/testdata/override.ini"),
 					Args:     []string{"cfg:default.paths.data=/tmp/data"},
 				})
 
@@ -139,7 +139,7 @@ func TestLoadingSettings(t *testing.T) {
 				cfg := NewCfg()
 				cfg.Load(&CommandLineArgs{
 					HomePath: "../../",
-					Config:   filepath.Join(HomePath, "tests/config-files/override.ini"),
+					Config:   filepath.Join(HomePath, "pkg/setting/testdata/override.ini"),
 					Args:     []string{"cfg:paths.data=/tmp/data"},
 				})
 
diff --git a/tests/config-files/override.ini b/pkg/setting/testdata/override.ini
similarity index 100%
rename from tests/config-files/override.ini
rename to pkg/setting/testdata/override.ini
diff --git a/tests/config-files/override_windows.ini b/pkg/setting/testdata/override_windows.ini
similarity index 100%
rename from tests/config-files/override_windows.ini
rename to pkg/setting/testdata/override_windows.ini