diff --git a/cmd/root_test.go b/cmd/root_test.go
index ae55cdec37..e325e0f747 100644
--- a/cmd/root_test.go
+++ b/cmd/root_test.go
@@ -761,13 +761,13 @@ func TestPrebuiltTools(t *testing.T) {
 	t.Setenv("SNOWFLAKE_WAREHOUSE", "your_wh")
 	t.Setenv("SNOWFLAKE_ROLE", "your_role")
 
-	t.Setenv("ORACLE_USERNAME", "your_oracle_username")
-	t.Setenv("ORACLE_PASS", "your_oracle_password")
-	t.Setenv("ORACLE_HOST", "your_oracle_host")
-	t.Setenv("ORACLE_PORT", "your_oracle_port")
+	t.Setenv("ORACLE_USERNAME", "your_oracle_db_username")
+	t.Setenv("ORACLE_PASS", "your_oracle_db_password")
+	t.Setenv("ORACLE_HOST", "your_oracle_db_host")
+	t.Setenv("ORACLE_PORT", "your_oracle_db_port")
 	t.Setenv("ORACLE_SERVICE_NAME", "your_oracle_service_name")
-	t.Setenv("ORACLE_USE_OCI", "your_oracle_use_oci")
-	t.Setenv("ORACLE_WALLET_LOCATION", "your_path_to_wallet")
+	t.Setenv("ORACLE_USE_OCI", "your_oracle_db_use_oci")
+	t.Setenv("ORACLE_WALLET_LOCATION", "your_path_to_oracldb_wallet")
 	t.Setenv("ORACLE_TNS_ADMIN", "your_path_to_tns_admin")
 
 	ctx, err := testutils.ContextWithNewLogger()
@@ -1083,7 +1083,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"snowflake_tools": tools.ToolsetConfig{
 					Name:      "snowflake_tools",
-					ToolNames: []string{"execute_sql", "list_tables","list_active_sessions","list_top_sql_by_resource","get_query_plan","list_tablespace_usage"},
+					ToolNames: []string{"execute_sql", "list_tables"},
 				},
 			},
 		},
@@ -1093,7 +1093,7 @@ func TestPrebuiltTools(t *testing.T) {
 			wantToolset: server.ToolsetConfigs{
 				"oracle_tools": tools.ToolsetConfig{
 					Name:      "oracle_tools",
-					ToolNames: []string{"execute_sql", "list_tables"},
+					ToolNames: []string{"execute_sql", "list_tables","list_active_sessions","list_top_sql_by_resource","get_query_plan","list_tablespace_usage"},
 				},
 
 			},
diff --git a/internal/prebuiltconfigs/prebuiltconfigs_test.go b/internal/prebuiltconfigs/prebuiltconfigs_test.go
index 1f0c54961b..5ea88677bd 100644
--- a/internal/prebuiltconfigs/prebuiltconfigs_test.go
+++ b/internal/prebuiltconfigs/prebuiltconfigs_test.go
@@ -47,7 +47,7 @@ var expectedToolSources = []string{
 	"mysql",
 	"neo4j",
 	"oceanbase",
-	"oracle",
+	"oracledb",
 	"postgres",
 	"serverless-spark",
 	"singlestore",
@@ -132,6 +132,8 @@ func TestGetPrebuiltTool(t *testing.T) {
 	neo4jconfig := getOrFatal(t, "neo4j")
 	healthcare_config := getOrFatal(t, "cloud-healthcare")
 	snowflake_config := getOrFatal(t, "snowflake")
+	oracle_config := getOrFatal(t,"oracledb")
+
 	if len(alloydb_omni_config) <= 0 {
 		t.Fatalf("unexpected error: could not fetch alloydb omni prebuilt tools yaml")
 	}