diff --git a/p4studio/profiles/testing.yaml b/p4studio/profiles/testing.yaml
index bfb65968f..dfe8e6459 100644
--- a/p4studio/profiles/testing.yaml
+++ b/p4studio/profiles/testing.yaml
@@ -1,8 +1,7 @@
 global-options: {}
 features:
-  # FIXME: broken
-  # bf-diags:
-    # thrift-diags: true
+  bf-diags:
+    thrift-diags: true
   drivers:
     bfrt: true
     bfrt-generic-flags: true
@@ -17,4 +16,5 @@ features:
     thrift-switch: true
 architectures:
   - tofino
-  - tofino2
+  # Cannot enble all of bf-diags, tofino, and tofino2 in same build.
+  # - tofino2