diff --git a/src/test/java/info/leadinglight/umljavadoclet/generics/TestGenerics7.java b/src/test/java/info/leadinglight/umljavadoclet/generics/TestGenerics7.java
new file mode 100644
index 0000000..3ab0a8e
--- /dev/null
+++ b/src/test/java/info/leadinglight/umljavadoclet/generics/TestGenerics7.java
@@ -0,0 +1,8 @@
+package info.leadinglight.umljavadoclet.generics;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+// TODO Does not show the bounds for P on the diagram.
+public class TestGenerics7<P extends ArrayList> extends HashMap<String,P> {
+}
diff --git a/src/test/java/info/leadinglight/umljavadoclet/generics/TestGenerics8.java b/src/test/java/info/leadinglight/umljavadoclet/generics/TestGenerics8.java
new file mode 100644
index 0000000..4ca5668
--- /dev/null
+++ b/src/test/java/info/leadinglight/umljavadoclet/generics/TestGenerics8.java
@@ -0,0 +1,12 @@
+package info.leadinglight.umljavadoclet.generics;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class TestGenerics8<P extends ArrayList> extends HashMap<String,P> {
+    public static class ListType {}
+    // TODO Wildcards not displayed with bounds.
+    public void addList(List<? extends ListType> list) {
+    }
+}