diff --git a/src/plugins/clangcodemodel/clangcompletion.cpp b/src/plugins/clangcodemodel/clangcompletion.cpp
index c5974aea708189b9cf2714910ca11014716976cc..f1b309239a89e6fe813556774f2632369050d3b1 100644
--- a/src/plugins/clangcodemodel/clangcompletion.cpp
+++ b/src/plugins/clangcodemodel/clangcompletion.cpp
@@ -60,7 +60,7 @@
 #include <QTextCursor>
 #include <QTextDocument>
 
-static const bool DebugTiming = !qgetenv("QTC_CLANG_VERBOSE").isEmpty();
+static const bool DebugTiming = qgetenv("QTC_CLANG_VERBOSE") == "1";
 
 using namespace ClangCodeModel;
 using namespace ClangCodeModel::Internal;
diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp
index 79348e44bd842bb93600f72637e237c86c7960c3..9a8dede302e9d7b7d4c4d316a9fceffd3adf6c91 100644
--- a/src/plugins/clangcodemodel/clangutils.cpp
+++ b/src/plugins/clangcodemodel/clangutils.cpp
@@ -45,7 +45,7 @@ using namespace ClangCodeModel::Internal;
 using namespace Core;
 using namespace CppTools;
 
-static const bool BeVerbose = !qgetenv("QTC_CLANG_VERBOSE").isEmpty();
+static const bool BeVerbose = qgetenv("QTC_CLANG_VERBOSE") == "1";
 
 namespace ClangCodeModel {
 namespace Utils {
diff --git a/src/plugins/clangcodemodel/cppcreatemarkers.cpp b/src/plugins/clangcodemodel/cppcreatemarkers.cpp
index 5cbac36dda956268e9213175eae52e579494ed3f..5171101ceb10a568a1fdcea3bd8decc0b7b3d8e4 100644
--- a/src/plugins/clangcodemodel/cppcreatemarkers.cpp
+++ b/src/plugins/clangcodemodel/cppcreatemarkers.cpp
@@ -41,7 +41,7 @@
 
 #include <QDebug>
 
-static const bool DebugTiming = !qgetenv("QTC_CLANG_VERBOSE").isEmpty();
+static const bool DebugTiming = qgetenv("QTC_CLANG_VERBOSE") == "1";
 
 using namespace ClangCodeModel;
 using namespace ClangCodeModel::Internal;
diff --git a/src/plugins/clangcodemodel/unit.cpp b/src/plugins/clangcodemodel/unit.cpp
index f9423465b7a991c400b09d804c4cc3af0a75f8bc..fe98601442372f9ac5dc2e93ad5f9c5f525eb578 100644
--- a/src/plugins/clangcodemodel/unit.cpp
+++ b/src/plugins/clangcodemodel/unit.cpp
@@ -47,7 +47,7 @@ static QBasicAtomicInt unitDataCount = Q_BASIC_ATOMIC_INITIALIZER(0);
 using namespace ClangCodeModel;
 using namespace ClangCodeModel::Internal;
 
-static const int DisplayDiagnostics = qgetenv("QTC_CLANG_VERBOSE").isEmpty() ? 0 : 1;
+static const int DisplayDiagnostics = (qgetenv("QTC_CLANG_VERBOSE") == "1") ? 1 : 0;
 
 Unit::Unit()
     : m_index(0)
diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp
index 51c3bde556368b1fdad665ef7d1d984bfe5d3cfa..99f3974e53ecc0cd6c8951789dc3eba8e1fd6fb4 100644
--- a/src/plugins/cpptools/builtinindexingsupport.cpp
+++ b/src/plugins/cpptools/builtinindexingsupport.cpp
@@ -16,6 +16,8 @@
 using namespace CppTools;
 using namespace CppTools::Internal;
 
+static const bool DumpFileNameWhileParsing = qgetenv("QTC_DUMP_FILENAME_WHILE_PARSING") == "1";
+
 namespace {
 
 static void parse(QFutureInterface<void> &future,
@@ -171,7 +173,7 @@ BuiltinIndexingSupport::BuiltinIndexingSupport()
     : m_revision(0)
 {
     m_synchronizer.setCancelOnWait(true);
-    m_dumpFileNameWhileParsing = !qgetenv("QTCREATOR_DUMP_FILENAME_WHILE_PARSING").isNull();
+    m_dumpFileNameWhileParsing = DumpFileNameWhileParsing;
 }
 
 BuiltinIndexingSupport::~BuiltinIndexingSupport()
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp
index 640e8bfa075171c3c0bff475e640bd4fd7d5e2b6..1312a2ab31d4217d43f9017d0ebd67e2b708fa4f 100644
--- a/src/plugins/cpptools/cppmodelmanager.cpp
+++ b/src/plugins/cpptools/cppmodelmanager.cpp
@@ -60,6 +60,8 @@
 #include <sstream>
 #endif
 
+static const bool DumpProjectInfo = qgetenv("QTC_DUMP_PROJECT_INFO") == "1";
+
 namespace CppTools {
 
 uint qHash(const ProjectPart &p)
@@ -245,7 +247,7 @@ CppModelManager::CppModelManager(QObject *parent)
             this, SIGNAL(globalSnapshotChanged()));
 
     m_findReferences = new CppFindReferences(this);
-    m_indexerEnabled = qgetenv("QTCREATOR_NO_CODE_INDEXER").isNull();
+    m_indexerEnabled = qgetenv("QTC_NO_CODE_INDEXER") != "1";
 
     m_dirty = true;
 
@@ -782,7 +784,7 @@ QFuture<void> CppModelManager::updateProjectInfo(const ProjectInfo &newProjectIn
     } // Mutex scope
 
     // If requested, dump everything we got
-    if (!qgetenv("QTCREATOR_DUMP_PROJECT_INFO").isEmpty())
+    if (DumpProjectInfo)
         dumpModelManagerConfiguration();
 
     // Remove files from snapshot that are not reachable any more