diff --git a/LICENSE.txt b/LICENSE.txt
index 0e71d679af..0bd90933c9 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -209,8 +209,7 @@ dependencies that have separate copyright notices and license terms. Your
 use of these libraries is subject to the terms and conditions of the 
 following licenses.
 
-For lib/google-collect-1.0-rc1.jar, lib/clhm-production.jar, and
-lib/json_simple-1.1.jar:
+For lib/clhm-production.jar, and lib/json_simple-1.1.jar:
 
 While developed outside the ASF, these projects are also licensed under
 the Apache License 2.0. The full text of the Apache License 2.0 can be
diff --git a/NOTICE.txt b/NOTICE.txt
index 4ee478728a..2a69c690cc 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -7,10 +7,6 @@ Foundation (http://www.apache.org/).
 Parser generation is provided by ANTLR, (http://www.antlr.org/).
 Copyright (c) 2003-2006 Terence Parr
 
-This product makes use of the google-collections library from
-http://code.google.com/p/google-collections/.
-Copyright (C) 2008 Google Inc.
-
 Some alternate data structures provided by high-scale-lib from
 http://sourceforge.net/projects/high-scale-lib/.
 Written by Cliff Click and released as Public Domain.
diff --git a/ivy.xml b/ivy.xml
index 02a264dde4..e0665421b3 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -30,6 +30,9 @@
                 name="paranamer-ant" rev="2.1"/>
     <dependency org="org.codehaus.jackson"
                 name="jackson-mapper-asl" rev="1.4.0"/>
+
+    <dependency org="com.google.collections" name="google-collections"
+                rev="1.0"/>
   </dependencies>
 </ivy-module>
 
diff --git a/lib/google-collect-1.0-rc1.jar b/lib/google-collect-1.0-rc1.jar
deleted file mode 100644
index bc499eea6c..0000000000
Binary files a/lib/google-collect-1.0-rc1.jar and /dev/null differ
diff --git a/test/cassandra.in.sh b/test/cassandra.in.sh
index 1daf9eb8c3..93a4497bab 100644
--- a/test/cassandra.in.sh
+++ b/test/cassandra.in.sh
@@ -27,7 +27,7 @@ cassandra_bin=$cassandra_home/build/classes
 # The java classpath (required)
 CLASSPATH=$CASSANDRA_CONF:$cassandra_bin
 
-for jar in $cassandra_home/lib/*.jar; do
+for jar in $cassandra_home/lib/*.jar $cassandra_home/build/lib/jars/*.jar; do
     CLASSPATH=$CLASSPATH:$jar
 done