diff --git a/tests/smoke/base-template.sh b/tests/smoke/base-template.sh
index 7489aae9..faea2850 100755
--- a/tests/smoke/base-template.sh
+++ b/tests/smoke/base-template.sh
@@ -54,9 +54,3 @@ cookiecutter --no-input \
 echo "${OUTPUT_DIR}"
 
 set +ex
-
-if [[ "${input_params}" == *"use_circleci=yes"* ]] && command -v circleci &> /dev/null; then
-  pushd /tmp/osl/osl-python-package
-  circleci config validate
-  popd
-fi
diff --git a/tests/smoke/ci.sh b/tests/smoke/ci.sh
index b2e6a662..028f538b 100755
--- a/tests/smoke/ci.sh
+++ b/tests/smoke/ci.sh
@@ -3,5 +3,17 @@ set -e
 
 SMOKE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
+# run the complete smoke tests
+. ${SMOKE_DIR}/base.sh "use_circleci=yes use_conda=yes"
+. ${SMOKE_DIR}/base.sh "use_circleci=yes use_pyenv=yes"
+
+# check the CI files from template
 . ${SMOKE_DIR}/base-template.sh "use_circleci=yes use_conda=yes"
+pushd /tmp/osl/osl-python-package
+  circleci config validate
+popd
+
 . ${SMOKE_DIR}/base-template.sh "use_circleci=yes use_pyenv=yes"
+pushd /tmp/osl/osl-python-package
+  circleci config validate
+popd