diff --git a/ceph/README.md b/ceph/README.md
index 1d282331e8..72746c32af 100644
--- a/ceph/README.md
+++ b/ceph/README.md
@@ -112,7 +112,7 @@ You should see a deployed/successful helm deployment:
 
 ```
 # helm ls
-NAME     	REVISION	UPDATED                 	STATUS  	CHART     
+NAME     	REVISION	UPDATED                 	STATUS  	CHART
 saucy-elk	1       	Thu Nov 17 13:43:27 2016	DEPLOYED	ceph-0.1.0
 ```
 
diff --git a/mariadb/README.md b/mariadb/README.md
index 55bf45efe8..b36f2228ad 100644
--- a/mariadb/README.md
+++ b/mariadb/README.md
@@ -4,7 +4,7 @@ By default, this chart creates a 3-member mariadb galera cluster.
 
 This chart leverages StatefulSets, with persistent storage.
 
-It creates a job that acts as a temporary standalone galera cluster.  This host is bootstrapped with authentication and then the WSREP bindings are exposed publicly.  The cluster members being StatefulSets are provisioned one at a time.  The first host must be marked as ```Ready``` before the next host will be provisioned.  This is determined by the readinessProbes which actually validate that MySQL is up and responsive. 
+It creates a job that acts as a temporary standalone galera cluster.  This host is bootstrapped with authentication and then the WSREP bindings are exposed publicly.  The cluster members being StatefulSets are provisioned one at a time.  The first host must be marked as ```Ready``` before the next host will be provisioned.  This is determined by the readinessProbes which actually validate that MySQL is up and responsive.
 
 The configuration leverages xtrabackup-v2 for synchronization.  This may later be augmented to leverage rsync which has some benefits.
 
diff --git a/tools/gate/setup_gate.sh b/tools/gate/setup_gate.sh
index b34802f49f..4b141aac02 100755
--- a/tools/gate/setup_gate.sh
+++ b/tools/gate/setup_gate.sh
@@ -24,6 +24,11 @@ export HOST_OS=${ID}
 source ${WORK_DIR}/tools/gate/funcs/network.sh
 source ${WORK_DIR}/tools/gate/funcs/helm.sh
 
+# Moving the ws-linter here to avoid it blocking all the jobs just for ws
+if [ "x$INTEGRATION_TYPE" == "xlinter" ]; then
+  bash ${WORK_DIR}/tools/gate/whitespace.sh
+fi
+
 # We setup the network for pre kube here, to enable cluster restarts on
 # development machines
 net_resolv_pre_kube
diff --git a/tools/gate/whitespace.sh b/tools/gate/whitespace.sh
new file mode 100755
index 0000000000..fdceb33198
--- /dev/null
+++ b/tools/gate/whitespace.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+set -ex
+
+folder='.'
+if [[ $# -gt 0 ]] ; then
+  folder="$1";
+fi
+
+res=$(find $folder \
+      -not -path "*/\.*" \
+      -not -path "*/doc/build/*" \
+      -not -name "*.tgz" \
+      -type f -exec egrep -l " +$" {} \;)
+
+if [[ -z $res ]] ; then
+  exit 0
+else
+  echo 'Trailing space(s) found.'
+  exit 1
+fi