diff --git a/Makefile b/Makefile
index 064737ef..82e5c343 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ install:
 	cp target/sendgrid-java-$(VERSION)-shaded.jar sendgrid-java.jar
 
 test:
-	mvn test
+	mvn test spotbugs:spotbugs checkstyle:check -Dcheckstyle.config.location=google_checks.xml
 
 test-integ: test
 
diff --git a/pom.xml b/pom.xml
index cfa43c93..f91a2e6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,6 +259,18 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <version>4.0.4</version>
+        <dependencies>
+          <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs</artifactId>
+            <version>4.0.4</version>
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
   </build>
   <developers>
@@ -309,4 +321,13 @@
       <version>1.66</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <version>3.0.0</version>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>