diff --git a/sbt/src/sbt-test/source-dependencies/java-generic-workaround/A.java b/sbt/src/sbt-test/source-dependencies/java-generic-workaround/A.java
new file mode 100644
index 000000000..7ac3d1a41
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/java-generic-workaround/A.java
@@ -0,0 +1,7 @@
+
+public class A<T> {
+   class B {
+      class C {
+      }
+   }
+}
diff --git a/sbt/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java b/sbt/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java
new file mode 100644
index 000000000..eec11ccea
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/java-generic-workaround/DefaultTreeTableSorter.java
@@ -0,0 +1,15 @@
+import javax.swing.DefaultRowSorter;
+import javax.swing.tree.TreeModel;
+import javax.swing.tree.TreePath;
+
+public class DefaultTreeTableSorter<T extends TreeModel, C extends TreeColumnModel, I>
+		implements TreeTableSorter<T,C>, TreeTableSorter.SortCycle {
+
+	public class NodeSorter extends DefaultRowSorter<T,I> implements SortCycle {
+
+		protected TreeTableWrapper getTreeTableModelWrapper() {
+			return (TreeTableWrapper)getModelWrapper();
+		}
+		protected abstract class TreeTableWrapper extends ModelWrapper<T,I> {}
+	}
+}
diff --git a/sbt/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java b/sbt/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java
new file mode 100644
index 000000000..bd66a91b8
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/java-generic-workaround/TreeColumnModel.java
@@ -0,0 +1 @@
+public interface TreeColumnModel {}
diff --git a/sbt/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java b/sbt/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java
new file mode 100644
index 000000000..08b9f38f5
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/java-generic-workaround/TreeTableSorter.java
@@ -0,0 +1,5 @@
+import javax.swing.tree.TreeModel;
+
+public interface TreeTableSorter<T extends TreeModel, C extends TreeColumnModel> {
+	public interface SortCycle {}
+}
diff --git a/sbt/src/sbt-test/source-dependencies/java-generic-workaround/test b/sbt/src/sbt-test/source-dependencies/java-generic-workaround/test
new file mode 100644
index 000000000..125967284
--- /dev/null
+++ b/sbt/src/sbt-test/source-dependencies/java-generic-workaround/test
@@ -0,0 +1,3 @@
+# generic signatures fails to parse due to http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6476261
+# tests workaround for https://github.com/sbt/sbt/issues/1035
+> compile