diff --git a/src/com/sun/ts/tests/jsf/spec/jstl/common/CommonBean.java b/src/com/sun/ts/tests/jsf/spec/jstl/common/CommonBean.java
index 217dc2da40..029c138ad2 100644
--- a/src/com/sun/ts/tests/jsf/spec/jstl/common/CommonBean.java
+++ b/src/com/sun/ts/tests/jsf/spec/jstl/common/CommonBean.java
@@ -26,6 +26,8 @@
 import java.util.List;
 import java.util.Map;
 
+@jakarta.inject.Named("commonBean")
+@jakarta.enterprise.context.RequestScoped
 public class CommonBean {
 
   private String escapeString = "><&'\"";
diff --git a/src/com/sun/ts/tests/jsf/spec/jstl/common/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/jstl/common/faces-config.xml
index ffee62d48c..bfc00ac678 100644
--- a/src/com/sun/ts/tests/jsf/spec/jstl/common/faces-config.xml
+++ b/src/com/sun/ts/tests/jsf/spec/jstl/common/faces-config.xml
@@ -22,12 +22,5 @@
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
 
-    <managed-bean>
-        <managed-bean-name>commonBean</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.jstl.common.CommonBean
-        </managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>
     
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/jstl/foreachtag/BandBean.java b/src/com/sun/ts/tests/jsf/spec/jstl/foreachtag/BandBean.java
index 153e74b2b9..64269b1902 100644
--- a/src/com/sun/ts/tests/jsf/spec/jstl/foreachtag/BandBean.java
+++ b/src/com/sun/ts/tests/jsf/spec/jstl/foreachtag/BandBean.java
@@ -27,6 +27,8 @@
 import java.util.TreeSet;
 import java.util.Vector;
 
+@jakarta.inject.Named("Band")
+@jakarta.enterprise.context.RequestScoped
 public class BandBean {
 
   private String[] firstNames = { "Geddy", "Alex", "Neil" };
diff --git a/src/com/sun/ts/tests/jsf/spec/jstl/foreachtag/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/jstl/foreachtag/faces-config.xml
index 9ce826d758..f026ffdb24 100644
--- a/src/com/sun/ts/tests/jsf/spec/jstl/foreachtag/faces-config.xml
+++ b/src/com/sun/ts/tests/jsf/spec/jstl/foreachtag/faces-config.xml
@@ -22,12 +22,5 @@
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
 
-    <managed-bean>
-        <managed-bean-name>Band</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.jstl.foreachtag.BandBean
-        </managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>
 
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/render/common/AttributeBean.java b/src/com/sun/ts/tests/jsf/spec/render/common/AttributeBean.java
index ebe33dcb0b..02cf963315 100644
--- a/src/com/sun/ts/tests/jsf/spec/render/common/AttributeBean.java
+++ b/src/com/sun/ts/tests/jsf/spec/render/common/AttributeBean.java
@@ -25,6 +25,8 @@
 
 @jakarta.inject.Named("Attribute") @jakarta.enterprise.context.SessionScoped
 public class AttributeBean {
+  
+  @jakarta.enterprise.context.Dependent
   public Map<String, Object> attMap = new HashMap<String, Object>();
 
   {
diff --git a/src/com/sun/ts/tests/jsf/spec/templating/common/NameBean.java b/src/com/sun/ts/tests/jsf/spec/templating/common/NameBean.java
index f967f9f221..76b34b9b73 100644
--- a/src/com/sun/ts/tests/jsf/spec/templating/common/NameBean.java
+++ b/src/com/sun/ts/tests/jsf/spec/templating/common/NameBean.java
@@ -24,6 +24,8 @@
 
 import jakarta.faces.component.UIOutput;
 
+@jakarta.inject.Named("Character")
+@jakarta.enterprise.context.RequestScoped
 public class NameBean implements Serializable {
 
   private UIOutput name;
diff --git a/src/com/sun/ts/tests/jsf/spec/templating/component/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/templating/component/faces-config.xml
index 6a1f8e3fb9..6a7f68b81e 100644
--- a/src/com/sun/ts/tests/jsf/spec/templating/component/faces-config.xml
+++ b/src/com/sun/ts/tests/jsf/spec/templating/component/faces-config.xml
@@ -22,12 +22,5 @@
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
 
-    <managed-bean>
-        <managed-bean-name>Character</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.templating.common.NameBean
-        </managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>
 
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/templating/fragment/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/templating/fragment/faces-config.xml
index 6a1f8e3fb9..3b506e5def 100644
--- a/src/com/sun/ts/tests/jsf/spec/templating/fragment/faces-config.xml
+++ b/src/com/sun/ts/tests/jsf/spec/templating/fragment/faces-config.xml
@@ -22,12 +22,4 @@
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
 
-    <managed-bean>
-        <managed-bean-name>Character</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.templating.common.NameBean
-        </managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>
-
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/templating/repeat/ColorBean.java b/src/com/sun/ts/tests/jsf/spec/templating/repeat/ColorBean.java
index c64dc34965..02c571810d 100644
--- a/src/com/sun/ts/tests/jsf/spec/templating/repeat/ColorBean.java
+++ b/src/com/sun/ts/tests/jsf/spec/templating/repeat/ColorBean.java
@@ -23,6 +23,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+@jakarta.inject.Named("Color")
+@jakarta.enterprise.context.RequestScoped
 public class ColorBean {
 
   private List<String> colors = new ArrayList<String>();
diff --git a/src/com/sun/ts/tests/jsf/spec/templating/repeat/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/templating/repeat/faces-config.xml
index 0a6d1bbb81..f026ffdb24 100644
--- a/src/com/sun/ts/tests/jsf/spec/templating/repeat/faces-config.xml
+++ b/src/com/sun/ts/tests/jsf/spec/templating/repeat/faces-config.xml
@@ -22,12 +22,5 @@
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
 
-    <managed-bean>
-        <managed-bean-name>Color</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.templating.repeat.ColorBean
-        </managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>
 
 </faces-config>