diff --git a/.travis.yml b/.travis.yml
index 2ea529e252..474f6867fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -131,6 +131,7 @@ addons:
       - docbook-xsl
       - docbook-xml
       - xmlto
+      - shellcheck
   ## (OSX only)
   homebrew:
     packages:
@@ -154,6 +155,7 @@ addons:
       ## Always installed, because manual brew installs are hard to get right
       - asciidoc
       - xmlto
+      - shellcheck
 
 ## (OSX only) Use the default OSX image
 ## See https://docs.travis-ci.com/user/reference/osx#os-x-version
diff --git a/Makefile.am b/Makefile.am
index 84050f8b34..a5086b3035 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -215,7 +215,16 @@ doxygen:
 test: all
 	$(top_builddir)/src/test/test
 
-check-local: check-spaces check-changes check-includes
+shellcheck:
+        # Only use shellcheck if it is present
+	if command -v shellcheck; then \
+	        find $(top_srcdir)/scripts/ -name "*.sh" -exec shellcheck {} +; \
+	        if [ -d "$(top_srcdir)/scripts/test" ]; then \
+                        shellcheck $(top_srcdir)/scripts/test/cov-diff $(top_builddir)/scripts/test/coverage; \
+                fi; \
+	fi
+
+check-local: check-spaces check-changes check-includes shellcheck
 
 need-chutney-path:
 	@if test ! -d "$$CHUTNEY_PATH"; then \
diff --git a/changes/ticket28058 b/changes/ticket28058
new file mode 100644
index 0000000000..00ac595864
--- /dev/null
+++ b/changes/ticket28058
@@ -0,0 +1,2 @@
+  o Testing:
+    - Run shellcheck for stuff in scripts/ directory. Closes ticket 28058.