diff --git a/kdecore/config/kconfig.cpp b/kdecore/config/kconfig.cpp
index f827053c..8d4fcb07 100644
--- a/kdecore/config/kconfig.cpp
+++ b/kdecore/config/kconfig.cpp
@@ -62,33 +62,6 @@ KConfigPrivate::KConfigPrivate(const KComponentData &componentData_, KConfig::Op
 {
     sGlobalFileName = componentData.dirs()->saveLocation("config", QString(), false) + QLatin1String("kdeglobals");
 
-    static int use_etc_kderc = -1;
-    if (use_etc_kderc < 0)
-        use_etc_kderc = getenv("KDE_SKIP_KDERC") != 0 ? 0 : 1; // for unit tests
-    if (use_etc_kderc) {
-
-        etc_kderc =
-            QLatin1String("/etc/kde4rc");
-        if (!KStandardDirs::checkAccess(etc_kderc, R_OK)) {
-            etc_kderc.clear();
-        }
-    }
-
-//    if (!mappingsRegistered) {
-//        KEntryMap tmp;
-//        if (!etc_kderc.isEmpty()) {
-//            KSharedPtr<KConfigBackend> backend = KConfigBackend::create(componentData, etc_kderc, QLatin1String("INI"));
-//            backend->parseConfig( "en_US", tmp, KConfigBackend::ParseDefaults);
-//        }
-//        const QString kde4rc(QDir::home().filePath(".kde4rc"));
-//        if (KStandardDirs::checkAccess(kde4rc, R_OK)) {
-//            KSharedPtr<KConfigBackend> backend = KConfigBackend::create(componentData, kde4rc, QLatin1String("INI"));
-//            backend->parseConfig( "en_US", tmp, KConfigBackend::ParseOptions());
-//        }
-//        KConfigBackend::registerMappings(tmp);
-//        mappingsRegistered = true;
-//    }
-
     setLocale(KGlobal::hasLocale() ? KGlobal::locale()->language() : KLocale::defaultLanguage());
 }
 
@@ -598,10 +571,6 @@ QStringList KConfigPrivate::getGlobalFiles() const
     QStringList globalFiles;
     foreach (const QString& dir1, dirs->findAllResources("config", QLatin1String("kdeglobals")))
         globalFiles.push_front(dir1);
-    foreach (const QString& dir2, dirs->findAllResources("config", QLatin1String("system.kdeglobals")))
-        globalFiles.push_front(dir2);
-    if (!etc_kderc.isEmpty())
-        globalFiles.push_front(etc_kderc);
     return globalFiles;
 }
 
diff --git a/kdecore/util/qtest_kde.h b/kdecore/util/qtest_kde.h
index a90357d5..0302e6f7 100644
--- a/kdecore/util/qtest_kde.h
+++ b/kdecore/util/qtest_kde.h
@@ -73,7 +73,6 @@ int main(int argc, char *argv[]) \
     setenv("KDEHOME", QFile::encodeName( QDir::homePath() + QString::fromLatin1("/.kde-unit-test") ), 1); \
     setenv("XDG_DATA_HOME", QFile::encodeName( QDir::homePath() + QString::fromLatin1("/.kde-unit-test/xdg/local") ), 1); \
     setenv("XDG_CONFIG_HOME", QFile::encodeName( QDir::homePath() + QString::fromLatin1("/.kde-unit-test/xdg/config") ), 1); \
-    setenv("KDE_SKIP_KDERC", "1", 1); \
     unsetenv("KDE_COLOR_DEBUG"); \
     QFile::remove(QDir::homePath() + QString::fromLatin1("/.kde-unit-test/share/config/qttestrc"));  \
     KAboutData aboutData( QByteArray(componentName), QByteArray(), ki18n("KDE Test Program"), QByteArray("version") );  \
@@ -124,7 +123,6 @@ int main(int argc, char *argv[]) \
     setenv("KDEHOME", QFile::encodeName( QDir::homePath() + QString::fromLatin1("/.kde-unit-test" )), 1); \
     setenv("XDG_DATA_HOME", QFile::encodeName( QDir::homePath() + QString::fromLatin1("/.kde-unit-test/xdg/local") ), 1); \
     setenv("XDG_CONFIG_HOME", QFile::encodeName( QDir::homePath() + QString::fromLatin1("/.kde-unit-test/xdg/config") ), 1); \
-    setenv("KDE_SKIP_KDERC", "1", 1); \
     unsetenv("KDE_COLOR_DEBUG"); \
     QFile::remove(QDir::homePath() + QString::fromLatin1("/.kde-unit-test/share/config/qttestrc"));  \
     KAboutData aboutData( QByteArray(componentName), QByteArray(), ki18n("KDE Test Program"), QByteArray("version") );  \
diff --git a/kdeui/tests/kmanagerselectiontest.cpp b/kdeui/tests/kmanagerselectiontest.cpp
index 6a75893f..30e01202 100644
--- a/kdeui/tests/kmanagerselectiontest.cpp
+++ b/kdeui/tests/kmanagerselectiontest.cpp
@@ -149,7 +149,6 @@ int main(int argc, char *argv[]) \
     setenv("KDEHOME", QFile::encodeName( QDir::homePath() + QLatin1String("/.kde-unit-test") ), 1); \
     setenv("XDG_DATA_HOME", QFile::encodeName( QDir::homePath() + QLatin1String("/.kde-unit-test/xdg/local") ), 1); \
     setenv("XDG_CONFIG_HOME", QFile::encodeName( QDir::homePath() + QLatin1String("/.kde-unit-test/xdg/config") ), 1); \
-    setenv("KDE_SKIP_KDERC", "1", 1); \
     unsetenv("KDE_COLOR_DEBUG"); \
     QFile::remove(QDir::homePath() + QLatin1String("/.kde-unit-test/share/config/qttestrc"));  \
     KAboutData aboutData( QByteArray(componentName), QByteArray(), ki18n("KDE Test Program"), QByteArray("version") );  \
diff --git a/kdeui/tests/kstartupinfo_unittest.cpp b/kdeui/tests/kstartupinfo_unittest.cpp
index 8f90281c..36ca3236 100644
--- a/kdeui/tests/kstartupinfo_unittest.cpp
+++ b/kdeui/tests/kstartupinfo_unittest.cpp
@@ -102,7 +102,6 @@ int main(int argc, char *argv[]) \
     setenv("KDEHOME", QFile::encodeName( QDir::homePath() + QLatin1String("/.kde-unit-test") ), 1); \
     setenv("XDG_DATA_HOME", QFile::encodeName( QDir::homePath() + QLatin1String("/.kde-unit-test/xdg/local") ), 1); \
     setenv("XDG_CONFIG_HOME", QFile::encodeName( QDir::homePath() + QLatin1String("/.kde-unit-test/xdg/config") ), 1); \
-    setenv("KDE_SKIP_KDERC", "1", 1); \
     unsetenv("KDE_COLOR_DEBUG"); \
     QFile::remove(QDir::homePath() + QLatin1String("/.kde-unit-test/share/config/qttestrc"));  \
     KAboutData aboutData( QByteArray(componentName), QByteArray(), ki18n("KDE Test Program"), QByteArray("version") );  \