diff --git a/.travis.yml b/.travis.yml
index c52f1af36..24af341a5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,8 +30,9 @@ addons:
     - libstdc++6:i386
     - net-tools
     - iproute2
+    - shellcheck
 
 script:
-
     - bash tests/tests_jc2server.sh
     - bash tests/tests_ts3server.sh
+    - bash tests/tests_shellcheck.sh
\ No newline at end of file
diff --git a/tests/tests_shellcheck.sh b/tests/tests_shellcheck.sh
new file mode 100644
index 000000000..8970de676
--- /dev/null
+++ b/tests/tests_shellcheck.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Project: Game Server Managers - LinuxGSM
+# Author: Daniel Gibbs
+# License: MIT License, Copyright (c) 2017 Daniel Gibbs
+# Purpose: TravisCI Tests: Shellcheck | Linux Game Server Management Script
+# Contributors: https://github.com/GameServerManagers/LinuxGSM/graphs/contributors
+# Documentation: https://github.com/GameServerManagers/LinuxGSM/wiki
+# Website: https://gameservermanagers.com
+
+echo "START Shellcheck"
+echo "================================="
+find . -type f -name "*.sh" -not -path "./shunit2-2.1.6/*" -exec shellcheck --shell=bash --exclude=SC2154,SC2034 {} \;
+find . -type f -name "*.cfg" -not -path "./shunit2-2.1.6/*" -exec shellcheck --shell=bash --exclude=SC2154,SC2034 {} \;
+echo "================================="
+echo "END Shellcheck"
\ No newline at end of file