diff --git a/defaults/main.yml b/defaults/main.yml
index 83ac04e..fdc3fa6 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -73,6 +73,12 @@ cvmfs_repositories:
 #   https://cvmfs.readthedocs.io/en/stable/cpt-configure.html#proxy-lists
 cvmfs_http_proxy: "DIRECT"
 
+# Whether to run cvmfs_config chksetup and cvmfs_config probe
+# after installation to verify that the client is working.
+# Set to false if you are going to tweak the configuration (eg. custom key) before first use.
+
+cvmfs_client_do_test: true
+
 # This dict allows arbitrary CVMFS client settings to be applied in /etc/cvmfs/default.local .
 # Use this to apply any other settings, aside from those already defined by 
 # other variables (CVMFS_REPOSITORIES, CVMFS_QUOTA_LIMIT, CVMFS_HTTP_PROXY).
diff --git a/tasks/main.yml b/tasks/main.yml
index bf6cdcc..527ed2b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -12,5 +12,4 @@
 - { import_tasks: storage.yml, tags: ['cvmfs', 'storage'], when: cvmfs_client_configure_storage | bool }
 - { import_tasks: packages.yml, tags: ['cvmfs', 'packages'] }
 - { import_tasks: config.yml, tags: ['cvmfs', 'config'] }
-- { import_tasks: test.yml, tags: ['cvmfs', 'test'] }
-
+- { import_tasks: test.yml, tags: ['cvmfs', 'test'], when: cvmfs_client_do_test | bool }