diff --git a/.travis.yml b/.travis.yml
index a215383b5..d3aa2b9d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,9 @@ android:
     # if you need to run emulator(s) during your tests
     - sys-img-x86-android-17
 
-script: gradle build lint test
+script: gradle build lint findbugs test
 
 after_failure:
 - cat app/build/outputs/lint-results.xml
+- cat app/build/reports/findbugs/findbugs.html
+- cat app/build/reports/tests/debug/index.html
diff --git a/app/build.gradle b/app/build.gradle
index e45392fa4..5fa45db05 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,10 @@
 apply plugin: 'com.android.application'
+apply plugin: 'findbugs'
+
+findbugs {
+    sourceSets = []
+    ignoreFailures = false
+}
 
 android {
     compileSdkVersion 23
@@ -36,3 +42,22 @@ dependencies {
     testCompile 'junit:junit:4.12'
     testCompile "org.robolectric:robolectric:3.0"
 }
+
+task findbugs(type: FindBugs, dependsOn: assembleDebug) {
+
+    description 'Run findbugs'
+    group 'verification'
+
+    classes = fileTree('build/intermediates/classes/debug/')
+    source = fileTree('src/main/java')
+    classpath = files()
+
+    effort = 'max'
+
+    excludeFilter = file("./config/findbugs/exclude.xml")
+
+    reports {
+        xml.enabled = false
+        html.enabled = true
+    }
+}
\ No newline at end of file
diff --git a/app/config/findbugs/exclude.xml b/app/config/findbugs/exclude.xml
new file mode 100644
index 000000000..8f7997b7c
--- /dev/null
+++ b/app/config/findbugs/exclude.xml
@@ -0,0 +1,10 @@
+<FindBugsFilter>
+
+    <Match>
+        <Class name="~.*R\$.*"/>
+    </Match>
+    <Match>
+        <Class name="~.*Manifest\$.*"/>
+    </Match>
+
+</FindBugsFilter>
diff --git a/app/src/main/java/protect/card_locker/DBHelper.java b/app/src/main/java/protect/card_locker/DBHelper.java
index 6d2890b4f..9e51043f2 100644
--- a/app/src/main/java/protect/card_locker/DBHelper.java
+++ b/app/src/main/java/protect/card_locker/DBHelper.java
@@ -12,7 +12,7 @@ public class DBHelper extends SQLiteOpenHelper
     public static final String DATABASE_NAME = "LoyaltyCards.db";
     public static final int DATABASE_VERSION = 1;
 
-    class LoyaltyCardDbIds
+    static class LoyaltyCardDbIds
     {
         public static final String TABLE = "cards";
         public static final String ID = "_id";