diff --git a/activemq-broker/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java b/activemq-broker/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java
index e320a9fc0a..e2a3d8eb3a 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/security/DefaultAuthorizationMap.java
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.filter.DestinationFilter;
 import org.apache.activemq.filter.DestinationMap;
 import org.apache.activemq.filter.DestinationMapEntry;
 
@@ -171,19 +170,7 @@ public class DefaultAuthorizationMap extends DestinationMap implements Authoriza
             }
             return answer;
         }
-
-        Set answer = findWildcardMatches(key);
-
-        if (key.isPattern()) {
-            for (Iterator<Object> iterator = answer.iterator(); iterator.hasNext(); ) {
-                AuthorizationEntry entry = (AuthorizationEntry)iterator.next();
-                DestinationFilter filter = DestinationFilter.parseFilter(entry.getDestination());
-                if (!filter.matches(key)) {
-                    iterator.remove();
-                }
-            }
-        }
-        return answer;
+        return findWildcardMatches(key);
     }
 
 
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java
index c2b3bc4e67..b6ace87282 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/security/AuthorizationMapTest.java
@@ -89,24 +89,6 @@ public class AuthorizationMapTest extends TestCase {
         assertTrue("Contains users group", tempAdminACLs.contains(TEMP_DESTINATION_ADMINS));
     }
 
-    public void testWildcardSubscriptions() {
-        AuthorizationMap map = createAuthorizationMap();
-        Set<?> readACLs = map.getReadACLs(new ActiveMQQueue(">"));
-        assertEquals("set size: " + readACLs, 1, readACLs.size());
-        assertTrue("Contains admins group", readACLs.contains(ADMINS));
-        assertFalse("Contains users group", readACLs.contains(USERS));
-
-        readACLs = map.getReadACLs(new ActiveMQQueue("USERS.>"));
-        assertEquals("set size: " + readACLs, 2, readACLs.size());
-        assertTrue("Contains admins group", readACLs.contains(ADMINS));
-        assertTrue("Contains users group", readACLs.contains(USERS));
-
-        readACLs = map.getReadACLs(new ActiveMQQueue("USERS.FOO.>"));
-        assertEquals("set size: " + readACLs, 2, readACLs.size());
-        assertTrue("Contains admins group", readACLs.contains(ADMINS));
-        assertTrue("Contains users group", readACLs.contains(USERS));
-    }
-
     protected AuthorizationMap createWildcardAuthorizationMap() {
         DefaultAuthorizationMap answer = new DefaultAuthorizationMap();