diff --git a/build.xml b/build.xml
index 3acd1ecf9e03b716194b449a40844da847343bdc..dcd9e8d2f0cc4b9d7d5718f9c14605423e35d0c6 100644
--- a/build.xml
+++ b/build.xml
@@ -67,6 +67,8 @@
         <include name="jython-2.5.2.jar"/>
         <include name="libthrift-0.7.0.jar"/>
         <include name="guava-13.0.1.jar" />
+        <include name="findbugs-annotations-2.0.1.jar" />
+        <include name="findbugs-jsr305-2.0.1.jar" />
     </patternset>
 
     <path id="classpath">
diff --git a/lib/findbugs-annotations-2.0.1.jar b/lib/findbugs-annotations-2.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..8a0204fc28d78a15a848f8d2d4af467e52bb43c8
Binary files /dev/null and b/lib/findbugs-annotations-2.0.1.jar differ
diff --git a/lib/findbugs-jsr305-2.0.1.jar b/lib/findbugs-jsr305-2.0.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..43807b02f35db48dc302b4ade0c72b2141d65cbb
Binary files /dev/null and b/lib/findbugs-jsr305-2.0.1.jar differ
diff --git a/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java b/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
index 8ddd7722949105ac42f215e9d57fb14c15e97bb9..5cdaee05b053c35facb67cfe50b69ddfae2fcf68 100644
--- a/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
+++ b/src/test/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImplTest.java
@@ -85,6 +85,8 @@ import org.openflow.util.HexString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 public class DeviceManagerImplTest extends FloodlightTestCase {
 
     protected static Logger logger =
@@ -96,6 +98,8 @@ public class DeviceManagerImplTest extends FloodlightTestCase {
     protected IPacket testARPReqPacket_1, testARPReqPacket_2;
     protected byte[] testARPReplyPacket_1_Srld, testARPReplyPacket_2_Srld;
     private byte[] testARPReplyPacket_3_Serialized;
+    @SuppressFBWarnings("MF_CLASS_MASKS_FIELD")
+    MockFloodlightProvider mockFloodlightProvider;
     DeviceManagerImpl deviceManager;
     MemoryStorageSource storageSource;
     FlowReconcileManager flowReconcileMgr;