diff --git a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/CustomBeanImplementationTest.java b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/CustomBeanImplementationTest.java
index 4881cd9745..bf2aad138d 100644
--- a/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/CustomBeanImplementationTest.java
+++ b/impl/src/main/java/org/jboss/cdi/tck/tests/full/definition/bean/custom/CustomBeanImplementationTest.java
@@ -140,9 +140,12 @@ public void testCustomBeanIsPassivationCapableDependency() throws IOException, C
         Assert.assertEquals(passCapBean.getFoo().getId(), actCapBean.getFoo().getId());
     }
 
-    @Test(enabled = false) // disabled due to CDITCK-579
-   // @SpecAssertion(section = INTER_MODULE_INJECTION, id = "r")
+    @Test
+    @SpecAssertion(section = INTER_MODULE_INJECTION, id = "r")
     public void testInjectionPointGetMemberIsUsedToDetermineTheClassThatDeclaresAnInjectionPoint(){
+        // resolve the bean and invoke a method on it to make sure it was created/used
+        Foo foo = getContextualReference(Foo.class, new PassivableLiteral());
+        foo.getId();
         Assert.assertEquals(CustomInjectionPoint.getMembersClasses().size(),2);
         Assert.assertTrue(CustomInjectionPoint.getMembersClasses().contains(Bar.class));
         Assert.assertTrue(CustomInjectionPoint.getMembersClasses().contains(Integer.class));
diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/BeanTypesWithIllegalTypeTest.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/BeanTypesWithIllegalTypeTest.java
index 9adefc09f4..85fd9a47a2 100644
--- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/BeanTypesWithIllegalTypeTest.java
+++ b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/BeanTypesWithIllegalTypeTest.java
@@ -59,18 +59,4 @@ public void sessionBeanTypesContainsOnlyLegalTypes() {
         assertEquals(birdBean.getTypes().size(), 2);
     }
 
-    @Test(enabled = false)
-    // disabled due to CDITCK-575 and marked as testable false
-    // @SpecAssertions({ @SpecAssertion(section = RESOURCE_TYPES, id = "b") })
-    public void resourceBeanTypesContainsOnlyLegalTypes() {
-
-        Bean<Dog> dogBean = getUniqueBean(Dog.class, Produced.ProducedLiteral.INSTANCE);
-        for (Type type : dogBean.getTypes()) {
-            if (type instanceof ParameterizedType) {
-                assertNotEquals(((ParameterizedType) type).getRawType(), AnimalHolder.class);
-            }
-        }
-        assertEquals(dogBean.getTypes().size(), 2);
-    }
-
 }
diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/Dog.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/Dog.java
deleted file mode 100644
index 5d29baaf22..0000000000
--- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/Dog.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2017, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.cdi.tck.tests.definition.bean.types.enterprise.illegal;
-
-public class Dog<T> implements AnimalHolder<Animal<? extends T>> {
-
-    public String name;
-
-}
diff --git a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/DogResourceProducer.java b/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/DogResourceProducer.java
deleted file mode 100644
index 591aa74a4d..0000000000
--- a/web/src/main/java/org/jboss/cdi/tck/tests/definition/bean/types/enterprise/illegal/DogResourceProducer.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2017, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.cdi.tck.tests.definition.bean.types.enterprise.illegal;
-
-import jakarta.annotation.Resource;
-import jakarta.enterprise.context.Dependent;
-import jakarta.enterprise.inject.Produces;
-
-@Dependent
-public class DogResourceProducer<T> {
-
-    @Produces
-    @Resource(name = "doggie")
-    @Produced
-    public Dog<T> doggie;
-}