diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
index e55e5fdc..e44b9eb8 100644
--- a/.github/workflows/ci-actions.yml
+++ b/.github/workflows/ci-actions.yml
@@ -2,7 +2,7 @@ name: Weld Testing CI
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ 5.0 ]
 
 jobs:
   build-weld-junit:
diff --git a/junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java b/junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java
index 24d70baa..2a4857ed 100644
--- a/junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java
+++ b/junit4/src/test/java/org/jboss/weld/junit4/resources/InjectResourcesTest.java
@@ -19,29 +19,13 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
 
-import java.util.List;
-import java.util.Map;
 import java.util.function.Function;
 
 import jakarta.enterprise.inject.spi.InjectionPoint;
-import jakarta.persistence.Cache;
-import jakarta.persistence.EntityGraph;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.EntityTransaction;
-import jakarta.persistence.FlushModeType;
-import jakarta.persistence.LockModeType;
-import jakarta.persistence.PersistenceUnitUtil;
-import jakarta.persistence.Query;
-import jakarta.persistence.StoredProcedureQuery;
-import jakarta.persistence.SynchronizationType;
-import jakarta.persistence.TypedQuery;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaDelete;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.CriteriaUpdate;
-import jakarta.persistence.metamodel.Metamodel;
 
 import org.jboss.weld.junit4.WeldInitiator;
 import org.junit.Rule;
@@ -51,7 +35,6 @@
  *
  * @author Martin Kouba
  */
-@SuppressWarnings("rawtypes")
 public class InjectResourcesTest {
 
     @Rule
@@ -87,320 +70,11 @@ public void testJpaInjection() {
     // Mock objects
 
     static Function<InjectionPoint, Object> getPCFactory() {
-        return ip -> new EntityManager() {
-
-            @Override
-            public <T> T unwrap(Class<T> cls) {
-                return null;
-            }
-
-            @Override
-            public void setProperty(String propertyName, Object value) {
-            }
-
-            @Override
-            public void setFlushMode(FlushModeType flushMode) {
-            }
-
-            @Override
-            public void remove(Object entity) {
-            }
-
-            @Override
-            public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
-            }
-
-            @Override
-            public void refresh(Object entity, LockModeType lockMode) {
-            }
-
-            @Override
-            public void refresh(Object entity, Map<String, Object> properties) {
-            }
-
-            @Override
-            public void refresh(Object entity) {
-            }
-
-            @Override
-            public void persist(Object entity) {
-            }
-
-            @Override
-            public <T> T merge(T entity) {
-                return null;
-            }
-
-            @Override
-            public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties) {
-            }
-
-            @Override
-            public void lock(Object entity, LockModeType lockMode) {
-            }
-
-            @Override
-            public void joinTransaction() {
-            }
-
-            @Override
-            public boolean isOpen() {
-                return false;
-            }
-
-            @Override
-            public boolean isJoinedToTransaction() {
-                return false;
-            }
-
-            @Override
-            public EntityTransaction getTransaction() {
-                return null;
-            }
-
-            @Override
-            public <T> T getReference(Class<T> entityClass, Object primaryKey) {
-                return null;
-            }
-
-            @Override
-            public Map<String, Object> getProperties() {
-                return null;
-            }
-
-            @Override
-            public Metamodel getMetamodel() {
-                return null;
-            }
-
-            @Override
-            public LockModeType getLockMode(Object entity) {
-                return null;
-            }
-
-            @Override
-            public FlushModeType getFlushMode() {
-                return null;
-            }
-
-            @Override
-            public EntityManagerFactory getEntityManagerFactory() {
-                return null;
-            }
-
-            @Override
-            public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
-                return null;
-            }
-
-            @Override
-            public EntityGraph<?> getEntityGraph(String graphName) {
-                return null;
-            }
-
-            @Override
-            public Object getDelegate() {
-                return null;
-            }
-
-            @Override
-            public CriteriaBuilder getCriteriaBuilder() {
-                return null;
-            }
-
-            @Override
-            public void flush() {
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode, Map<String, Object> properties) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey) {
-                return null;
-            }
-
-            @Override
-            public void detach(Object entity) {
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName, String... resultSetMappings) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public Query createQuery(CriteriaDelete deleteQuery) {
-                return null;
-            }
-
-            @Override
-            public Query createQuery(CriteriaUpdate updateQuery) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) {
-                return null;
-            }
-
-            @Override
-            public Query createQuery(String qlString) {
-                return null;
-            }
-
-            @Override
-            public Query createNativeQuery(String sqlString, String resultSetMapping) {
-                return null;
-            }
-
-            @Override
-            public Query createNativeQuery(String sqlString, Class resultClass) {
-                return null;
-            }
-
-            @Override
-            public Query createNativeQuery(String sqlString) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public Query createNamedQuery(String name) {
-                return null;
-            }
-
-            @Override
-            public EntityGraph<?> createEntityGraph(String graphName) {
-                return null;
-            }
-
-            @Override
-            public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
-                return null;
-            }
-
-            @Override
-            public boolean contains(Object entity) {
-                return false;
-            }
-
-            @Override
-            public void close() {
-            }
-
-            @Override
-            public void clear() {
-            }
-        };
+        return ip -> mock(EntityManager.class);
     }
 
     static Function<InjectionPoint, Object> getPUFactory() {
-        return ip -> new EntityManagerFactory() {
-
-            @Override
-            public <T> T unwrap(Class<T> cls) {
-                return null;
-            }
-
-            @Override
-            public boolean isOpen() {
-                return false;
-            }
-
-            @Override
-            public Map<String, Object> getProperties() {
-                return null;
-            }
-
-            @Override
-            public PersistenceUnitUtil getPersistenceUnitUtil() {
-                return null;
-            }
-
-            @Override
-            public Metamodel getMetamodel() {
-                return null;
-            }
-
-            @Override
-            public CriteriaBuilder getCriteriaBuilder() {
-                return null;
-            }
-
-            @Override
-            public Cache getCache() {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager(SynchronizationType synchronizationType, Map map) {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager(SynchronizationType synchronizationType) {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager(Map map) {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager() {
-                return null;
-            }
-
-            @Override
-            public void close() {
-            }
-
-            @Override
-            public void addNamedQuery(String name, Query query) {
-            }
-
-            @Override
-            public <T> void addNamedEntityGraph(String graphName, EntityGraph<T> entityGraph) {
-            }
-        };
+        return ip -> mock(EntityManagerFactory.class);
     }
 
 }
diff --git a/junit5/src/test/java/org/jboss/weld/junit5/resources/InjectResourcesTest.java b/junit5/src/test/java/org/jboss/weld/junit5/resources/InjectResourcesTest.java
index 9e798dfe..4e5a9726 100644
--- a/junit5/src/test/java/org/jboss/weld/junit5/resources/InjectResourcesTest.java
+++ b/junit5/src/test/java/org/jboss/weld/junit5/resources/InjectResourcesTest.java
@@ -19,29 +19,13 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
 
-import java.util.List;
-import java.util.Map;
 import java.util.function.Function;
 
 import jakarta.enterprise.inject.spi.InjectionPoint;
-import jakarta.persistence.Cache;
-import jakarta.persistence.EntityGraph;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EntityManagerFactory;
-import jakarta.persistence.EntityTransaction;
-import jakarta.persistence.FlushModeType;
-import jakarta.persistence.LockModeType;
-import jakarta.persistence.PersistenceUnitUtil;
-import jakarta.persistence.Query;
-import jakarta.persistence.StoredProcedureQuery;
-import jakarta.persistence.SynchronizationType;
-import jakarta.persistence.TypedQuery;
-import jakarta.persistence.criteria.CriteriaBuilder;
-import jakarta.persistence.criteria.CriteriaDelete;
-import jakarta.persistence.criteria.CriteriaQuery;
-import jakarta.persistence.criteria.CriteriaUpdate;
-import jakarta.persistence.metamodel.Metamodel;
 
 import org.jboss.weld.junit5.EnableWeld;
 import org.jboss.weld.junit5.WeldInitiator;
@@ -53,7 +37,6 @@
  * @author Martin Kouba
  */
 @EnableWeld
-@SuppressWarnings("rawtypes")
 public class InjectResourcesTest {
 
     @WeldSetup
@@ -89,320 +72,11 @@ public void testJpaInjection() {
     // Mock objects
 
     static Function<InjectionPoint, Object> getPCFactory() {
-        return ip -> new EntityManager() {
-
-            @Override
-            public <T> T unwrap(Class<T> cls) {
-                return null;
-            }
-
-            @Override
-            public void setProperty(String propertyName, Object value) {
-            }
-
-            @Override
-            public void setFlushMode(FlushModeType flushMode) {
-            }
-
-            @Override
-            public void remove(Object entity) {
-            }
-
-            @Override
-            public void refresh(Object entity, LockModeType lockMode, Map<String, Object> properties) {
-            }
-
-            @Override
-            public void refresh(Object entity, LockModeType lockMode) {
-            }
-
-            @Override
-            public void refresh(Object entity, Map<String, Object> properties) {
-            }
-
-            @Override
-            public void refresh(Object entity) {
-            }
-
-            @Override
-            public void persist(Object entity) {
-            }
-
-            @Override
-            public <T> T merge(T entity) {
-                return null;
-            }
-
-            @Override
-            public void lock(Object entity, LockModeType lockMode, Map<String, Object> properties) {
-            }
-
-            @Override
-            public void lock(Object entity, LockModeType lockMode) {
-            }
-
-            @Override
-            public void joinTransaction() {
-            }
-
-            @Override
-            public boolean isOpen() {
-                return false;
-            }
-
-            @Override
-            public boolean isJoinedToTransaction() {
-                return false;
-            }
-
-            @Override
-            public EntityTransaction getTransaction() {
-                return null;
-            }
-
-            @Override
-            public <T> T getReference(Class<T> entityClass, Object primaryKey) {
-                return null;
-            }
-
-            @Override
-            public Map<String, Object> getProperties() {
-                return null;
-            }
-
-            @Override
-            public Metamodel getMetamodel() {
-                return null;
-            }
-
-            @Override
-            public LockModeType getLockMode(Object entity) {
-                return null;
-            }
-
-            @Override
-            public FlushModeType getFlushMode() {
-                return null;
-            }
-
-            @Override
-            public EntityManagerFactory getEntityManagerFactory() {
-                return null;
-            }
-
-            @Override
-            public <T> List<EntityGraph<? super T>> getEntityGraphs(Class<T> entityClass) {
-                return null;
-            }
-
-            @Override
-            public EntityGraph<?> getEntityGraph(String graphName) {
-                return null;
-            }
-
-            @Override
-            public Object getDelegate() {
-                return null;
-            }
-
-            @Override
-            public CriteriaBuilder getCriteriaBuilder() {
-                return null;
-            }
-
-            @Override
-            public void flush() {
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode, Map<String, Object> properties) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, LockModeType lockMode) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey, Map<String, Object> properties) {
-                return null;
-            }
-
-            @Override
-            public <T> T find(Class<T> entityClass, Object primaryKey) {
-                return null;
-            }
-
-            @Override
-            public void detach(Object entity) {
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName, String... resultSetMappings) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName, Class... resultClasses) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createStoredProcedureQuery(String procedureName) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(String qlString, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public Query createQuery(CriteriaDelete deleteQuery) {
-                return null;
-            }
-
-            @Override
-            public Query createQuery(CriteriaUpdate updateQuery) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createQuery(CriteriaQuery<T> criteriaQuery) {
-                return null;
-            }
-
-            @Override
-            public Query createQuery(String qlString) {
-                return null;
-            }
-
-            @Override
-            public Query createNativeQuery(String sqlString, String resultSetMapping) {
-                return null;
-            }
-
-            @Override
-            public Query createNativeQuery(String sqlString, Class resultClass) {
-                return null;
-            }
-
-            @Override
-            public Query createNativeQuery(String sqlString) {
-                return null;
-            }
-
-            @Override
-            public StoredProcedureQuery createNamedStoredProcedureQuery(String name) {
-                return null;
-            }
-
-            @Override
-            public <T> TypedQuery<T> createNamedQuery(String name, Class<T> resultClass) {
-                return null;
-            }
-
-            @Override
-            public Query createNamedQuery(String name) {
-                return null;
-            }
-
-            @Override
-            public EntityGraph<?> createEntityGraph(String graphName) {
-                return null;
-            }
-
-            @Override
-            public <T> EntityGraph<T> createEntityGraph(Class<T> rootType) {
-                return null;
-            }
-
-            @Override
-            public boolean contains(Object entity) {
-                return false;
-            }
-
-            @Override
-            public void close() {
-            }
-
-            @Override
-            public void clear() {
-            }
-        };
+        return ip -> mock(EntityManager.class);
     }
 
     static Function<InjectionPoint, Object> getPUFactory() {
-        return ip -> new EntityManagerFactory() {
-
-            @Override
-            public <T> T unwrap(Class<T> cls) {
-                return null;
-            }
-
-            @Override
-            public boolean isOpen() {
-                return false;
-            }
-
-            @Override
-            public Map<String, Object> getProperties() {
-                return null;
-            }
-
-            @Override
-            public PersistenceUnitUtil getPersistenceUnitUtil() {
-                return null;
-            }
-
-            @Override
-            public Metamodel getMetamodel() {
-                return null;
-            }
-
-            @Override
-            public CriteriaBuilder getCriteriaBuilder() {
-                return null;
-            }
-
-            @Override
-            public Cache getCache() {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager(SynchronizationType synchronizationType, Map map) {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager(SynchronizationType synchronizationType) {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager(Map map) {
-                return null;
-            }
-
-            @Override
-            public EntityManager createEntityManager() {
-                return null;
-            }
-
-            @Override
-            public void close() {
-            }
-
-            @Override
-            public void addNamedQuery(String name, Query query) {
-            }
-
-            @Override
-            public <T> void addNamedEntityGraph(String graphName, EntityGraph<T> entityGraph) {
-            }
-        };
+        return ip -> mock(EntityManagerFactory.class);
     }
 
 }