diff --git a/config/201-clusterrolebinding.yaml b/config/201-clusterrolebinding.yaml
index cc212710602..63f67954039 100644
--- a/config/201-clusterrolebinding.yaml
+++ b/config/201-clusterrolebinding.yaml
@@ -100,4 +100,3 @@ roleRef:
   kind: ClusterRole
   name: tekton-pipelines-leader-election
   apiGroup: rbac.authorization.k8s.io
-
diff --git a/config/config-artifact-bucket.yaml b/config/config-artifact-bucket.yaml
index 381b0a12cf0..58e9693ce3d 100644
--- a/config/config-artifact-bucket.yaml
+++ b/config/config-artifact-bucket.yaml
@@ -20,14 +20,14 @@ metadata:
   labels:
     app.kubernetes.io/instance: default
     app.kubernetes.io/part-of: tekton-pipelines
-#  data:
-#    # location of the gcs bucket to be used for artifact storage
-#    location: "gs://bucket-name"
-#    # name of the secret that will contain the credentials for the service account
-#    # with access to the bucket
-#    bucket.service.account.secret.name:
-#    # The key in the secret with the required service account json
-#    bucket.service.account.secret.key:
-#    # The field name that should be used for the service account
-#    # Valid values: GOOGLE_APPLICATION_CREDENTIALS, BOTO_CONFIG.
-#    bucket.service.account.field.name: GOOGLE_APPLICATION_CREDENTIALS
\ No newline at end of file
+# data:
+#  # location of the gcs bucket to be used for artifact storage
+#  location: "gs://bucket-name"
+#  # name of the secret that will contain the credentials for the service account
+#  # with access to the bucket
+#  bucket.service.account.secret.name:
+#  # The key in the secret with the required service account json
+#  bucket.service.account.secret.key:
+#  # The field name that should be used for the service account
+#  # Valid values: GOOGLE_APPLICATION_CREDENTIALS, BOTO_CONFIG.
+#  bucket.service.account.field.name: GOOGLE_APPLICATION_CREDENTIALS
diff --git a/config/config-defaults.yaml b/config/config-defaults.yaml
index cfc623b342a..a75dc28eee4 100644
--- a/config/config-defaults.yaml
+++ b/config/config-defaults.yaml
@@ -62,7 +62,7 @@ data:
     # TaskRun specific sink, so the default is the only option available.
     # If no sink is specified, no CloudEvent is generated
     # default-cloud-events-sink:
-      
+
     # default-task-run-workspace-binding contains the default workspace
     # configuration provided for any Workspaces that a Task declares
     # but that a TaskRun does not explicitly provide.
diff --git a/examples/v1beta1/pipelineruns/pipelinerun-with-extra-params.yaml b/examples/v1beta1/pipelineruns/pipelinerun-with-extra-params.yaml
index 05e948f1454..3412bece845 100644
--- a/examples/v1beta1/pipelineruns/pipelinerun-with-extra-params.yaml
+++ b/examples/v1beta1/pipelineruns/pipelinerun-with-extra-params.yaml
@@ -50,7 +50,8 @@ spec:
     value: "100"
   - name: pl-param-y
     value: "200"
-  - name: pl-param-z # the extra parameter
+    # the extra parameter
+  - name: pl-param-z
     value: "300"
   pipelineRef:
     name: pipeline-with-extra-params
diff --git a/examples/v1beta1/pipelineruns/using_context_variables.yaml b/examples/v1beta1/pipelineruns/using_context_variables.yaml
index d05cf49b3a5..70936f07f37 100644
--- a/examples/v1beta1/pipelineruns/using_context_variables.yaml
+++ b/examples/v1beta1/pipelineruns/using_context_variables.yaml
@@ -11,7 +11,7 @@ spec:
       - name: pipeline-uid
         value: "$(context.pipelineRun.uid)"
       - name: pipeline-name
-        value: "$(context.pipeline.name)" 
+        value: "$(context.pipeline.name)"
       - name: pipelineRun-name
         value: "$(context.pipelineRun.name)"
       taskSpec:
diff --git a/examples/v1beta1/taskruns/creds-init-only-mounts-provided-credentials.yaml b/examples/v1beta1/taskruns/creds-init-only-mounts-provided-credentials.yaml
index 8fa456ff340..5e0cd4a9213 100644
--- a/examples/v1beta1/taskruns/creds-init-only-mounts-provided-credentials.yaml
+++ b/examples/v1beta1/taskruns/creds-init-only-mounts-provided-credentials.yaml
@@ -9,8 +9,10 @@ metadata:
   annotations:
     tekton.dev/git-0: localhost
 data:
-  ssh-privatekey: SGVsbG8sIHdvcmxkCg== # "Hello, world!"
-  known_hosts: SGVsbG8sIHdvcmxkCg== # "Hello, world!"
+  # "Hello, world!"
+  ssh-privatekey: SGVsbG8sIHdvcmxkCg==
+  # "Hello, world!"
+  known_hosts: SGVsbG8sIHdvcmxkCg==
 ---
 apiVersion: v1
 kind: ServiceAccount
diff --git a/examples/v1beta1/taskruns/run-steps-as-non-root.yaml b/examples/v1beta1/taskruns/run-steps-as-non-root.yaml
index c94696880d7..851bb658863 100644
--- a/examples/v1beta1/taskruns/run-steps-as-non-root.yaml
+++ b/examples/v1beta1/taskruns/run-steps-as-non-root.yaml
@@ -4,7 +4,7 @@ metadata:
   name: show-non-root-steps
 spec:
   steps:
-    # no securityContext specified so will use 
+    # no securityContext specified so will use
     # securityContext from TaskRun podTemplate
     - name: show-user-1001
       image: ubuntu
@@ -12,7 +12,7 @@ spec:
         - ps
       args:
         - "aux"
-    # securityContext specified so will run as  
+    # securityContext specified so will run as
     # user 2000 instead of 1001
     - name: show-user-2000
       image: ubuntu
diff --git a/test/presubmit-tests.sh b/test/presubmit-tests.sh
index 70226adf542..dbb7651c5d3 100755
--- a/test/presubmit-tests.sh
+++ b/test/presubmit-tests.sh
@@ -29,10 +29,37 @@ export DISABLE_YAML_LINTING=1
 
 source $(git rev-parse --show-toplevel)/vendor/github.com/tektoncd/plumbing/scripts/presubmit-tests.sh
 
+function check_go_lint() {
+    header "Testing if golint has been done"
+
+    # deadline of 5m, and show all the issues
+    golangci-lint -j 1 --color=never run
+
+    if [[ $? != 0 ]]; then
+        results_banner "Go Lint" 1
+        exit 1
+    fi
+
+    results_banner "Go Lint" 0
+}
+
+function check_yaml_lint() {
+    header "Testing if yamllint has been done"
+
+    local YAML_FILES=$(shell find . -type f -regex ".*y[a]ml" -print)
+    yamllint -c .yamllint ${YAML_FILES}
+
+    if [[ $? != 0 ]]; then
+        results_banner "YAML Lint" 1
+        exit 1
+    fi
+
+    results_banner "YAML Lint" 0
+}
+
 function post_build_tests() {
-  header "running golangci-lint"
-  # deadline of 5m, and show all the issues
-  golangci-lint -j 1 --color=never run
+  check_go_lint
+  check_yaml_lint
 }
 
 # We use the default build, unit and integration test runners.