diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4aaa6970c9c..8d31d4961a2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -151,7 +151,6 @@
 /pkg/tsdb/grafanads/ @grafana/backend-platform
 /pkg/tsdb/legacydata/ @grafana/backend-platform
 /pkg/tsdb/opentsdb/ @grafana/backend-platform
-/pkg/tsdb/sqleng/ @grafana/partner-datasources @grafana/oss-big-tent
 /pkg/util/ @grafana/backend-platform
 /pkg/web/ @grafana/backend-platform
 
diff --git a/pkg/tsdb/mssql/macros.go b/pkg/tsdb/mssql/macros.go
index 9a137ce496d..de01cc9a9f2 100644
--- a/pkg/tsdb/mssql/macros.go
+++ b/pkg/tsdb/mssql/macros.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng"
+	"github.com/grafana/grafana/pkg/tsdb/mssql/sqleng"
 )
 
 const rsIdentifier = `([_a-zA-Z0-9]+)`
diff --git a/pkg/tsdb/mssql/mssql.go b/pkg/tsdb/mssql/mssql.go
index 368e0141847..8d1cd05c98c 100644
--- a/pkg/tsdb/mssql/mssql.go
+++ b/pkg/tsdb/mssql/mssql.go
@@ -25,8 +25,8 @@ import (
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/mssql/kerberos"
+	"github.com/grafana/grafana/pkg/tsdb/mssql/sqleng"
 	"github.com/grafana/grafana/pkg/tsdb/mssql/utils"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng"
 	"github.com/grafana/grafana/pkg/util"
 )
 
diff --git a/pkg/tsdb/mssql/mssql_test.go b/pkg/tsdb/mssql/mssql_test.go
index 77b2c1f4fbf..7030e14e3a2 100644
--- a/pkg/tsdb/mssql/mssql_test.go
+++ b/pkg/tsdb/mssql/mssql_test.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/db"
 	"github.com/grafana/grafana/pkg/tsdb/mssql/kerberos"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng"
+	"github.com/grafana/grafana/pkg/tsdb/mssql/sqleng"
 )
 
 // To run this test, set runMssqlTests=true
diff --git a/pkg/tsdb/sqleng/sql_engine.go b/pkg/tsdb/mssql/sqleng/sql_engine.go
similarity index 100%
rename from pkg/tsdb/sqleng/sql_engine.go
rename to pkg/tsdb/mssql/sqleng/sql_engine.go
diff --git a/pkg/tsdb/sqleng/sql_engine_test.go b/pkg/tsdb/mssql/sqleng/sql_engine_test.go
similarity index 99%
rename from pkg/tsdb/sqleng/sql_engine_test.go
rename to pkg/tsdb/mssql/sqleng/sql_engine_test.go
index 367f6cb143a..2e3f8da78ee 100644
--- a/pkg/tsdb/sqleng/sql_engine_test.go
+++ b/pkg/tsdb/mssql/sqleng/sql_engine_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/log"
-	"github.com/grafana/grafana/pkg/tsdb/sqleng/util"
+	"github.com/grafana/grafana/pkg/tsdb/mssql/sqleng/util"
 )
 
 func TestSQLEngine(t *testing.T) {
diff --git a/pkg/tsdb/sqleng/util/util.go b/pkg/tsdb/mssql/sqleng/util/util.go
similarity index 100%
rename from pkg/tsdb/sqleng/util/util.go
rename to pkg/tsdb/mssql/sqleng/util/util.go