diff --git a/internal/providers/pluginfw/pluginfw.go b/internal/providers/pluginfw/pluginfw.go
index db811d5ae2..f7b8dbfa6f 100644
--- a/internal/providers/pluginfw/pluginfw.go
+++ b/internal/providers/pluginfw/pluginfw.go
@@ -21,6 +21,7 @@ import (
 	"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/resources/notificationdestinations"
 	"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/resources/qualitymonitor"
 	"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/resources/registered_model"
+	"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/resources/user"
 	"github.com/databricks/terraform-provider-databricks/internal/providers/pluginfw/resources/volume"
 
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
@@ -56,6 +57,7 @@ func (p *DatabricksProviderPluginFramework) DataSources(ctx context.Context) []f
 		volume.DataSourceVolumes,
 		registered_model.DataSourceRegisteredModel,
 		notificationdestinations.DataSourceNotificationDestinations,
+		user.DataSourceUsers,
 	}
 }
 
diff --git a/internal/acceptance/data_users_test.go b/internal/providers/pluginfw/resources/user/data_users_acc_test.go
similarity index 80%
rename from internal/acceptance/data_users_test.go
rename to internal/providers/pluginfw/resources/user/data_users_acc_test.go
index 21c1764798..1223d99ebe 100644
--- a/internal/acceptance/data_users_test.go
+++ b/internal/providers/pluginfw/resources/user/data_users_acc_test.go
@@ -1,8 +1,9 @@
-package acceptance
+package user_test
 
 import (
 	"testing"
 
+	"github.com/databricks/terraform-provider-databricks/internal/acceptance"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -47,7 +48,14 @@ func checkUsersDataSourcePopulated(t *testing.T) func(s *terraform.State) error
 }
 
 func TestAccDataSourceDataUsers(t *testing.T) {
-	AccountLevel(t, Step{
+	acceptance.AccountLevel(t, acceptance.Step{
+		Template: dataSourceTemplate,
+		Check:    checkUsersDataSourcePopulated(t),
+	})
+}
+
+func TestWorkspaceDataSourceDataUsers(t *testing.T) {
+	acceptance.WorkspaceLevel(t, acceptance.Step{
 		Template: dataSourceTemplate,
 		Check:    checkUsersDataSourcePopulated(t),
 	})