diff --git a/build.xml b/build.xml
index 54d622619a..d36b39ef2b 100644
--- a/build.xml
+++ b/build.xml
@@ -340,7 +340,7 @@
           <dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.0.5"/>
           <dependency groupId="net.jpountz.lz4" artifactId="lz4" version="1.2.0"/>
           <dependency groupId="com.ning" artifactId="compress-lzf" version="0.8.4"/>
-          <dependency groupId="com.google.guava" artifactId="guava" version="15.0"/>
+          <dependency groupId="com.google.guava" artifactId="guava" version="16.0"/>
           <dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/>
           <dependency groupId="commons-codec" artifactId="commons-codec" version="1.2"/>
           <dependency groupId="org.apache.commons" artifactId="commons-lang3" version="3.1"/>
@@ -418,7 +418,6 @@
       	<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster"/>
         <dependency groupId="org.apache.pig" artifactId="pig"/>
       	<dependency groupId="com.google.code.findbugs" artifactId="jsr305"/>
-        <dependency groupId="io.airlift" artifactId="airline"/>
       </artifact:pom>
 
       <artifact:pom id="coverage-deps-pom"
diff --git a/lib/guava-15.0.jar b/lib/guava-16.0.jar
similarity index 59%
rename from lib/guava-15.0.jar
rename to lib/guava-16.0.jar
index eb9ef8ad5f..7afcb1001f 100644
Binary files a/lib/guava-15.0.jar and b/lib/guava-16.0.jar differ
diff --git a/lib/licenses/guava-15.0.txt b/lib/licenses/guava-16.0.txt
similarity index 100%
rename from lib/licenses/guava-15.0.txt
rename to lib/licenses/guava-16.0.txt
diff --git a/src/java/org/apache/cassandra/tracing/TraceState.java b/src/java/org/apache/cassandra/tracing/TraceState.java
index 7f60433332..de8ca444f2 100644
--- a/src/java/org/apache/cassandra/tracing/TraceState.java
+++ b/src/java/org/apache/cassandra/tracing/TraceState.java
@@ -55,13 +55,12 @@ public class TraceState
         this.coordinator = coordinator;
         this.sessionId = sessionId;
         sessionIdBytes = ByteBufferUtil.bytes(sessionId);
-        watch = new Stopwatch();
-        watch.start();
+        watch = Stopwatch.createStarted();
     }
 
     public int elapsed()
     {
-        long elapsed = watch.elapsedTime(TimeUnit.MICROSECONDS);
+        long elapsed = watch.elapsed(TimeUnit.MICROSECONDS);
         return elapsed < Integer.MAX_VALUE ? (int) elapsed : Integer.MAX_VALUE;
     }