diff --git a/src/corelib/time/qtimezonelocale_p.h b/src/corelib/time/qtimezonelocale_p.h
index 2b2c4451d8..adc8e83b35 100644
--- a/src/corelib/time/qtimezonelocale_p.h
+++ b/src/corelib/time/qtimezonelocale_p.h
@@ -17,6 +17,7 @@
 
 #include <QtCore/qtimezone.h>
 
+QT_REQUIRE_CONFIG(timezone);
 QT_REQUIRE_CONFIG(timezone_locale);
 
 namespace QtTimeZoneLocale {
diff --git a/src/corelib/time/qtimezoneprivate_data_p.h b/src/corelib/time/qtimezoneprivate_data_p.h
index 98b55df10b..659605b224 100644
--- a/src/corelib/time/qtimezoneprivate_data_p.h
+++ b/src/corelib/time/qtimezoneprivate_data_p.h
@@ -20,6 +20,7 @@
 #include "qbytearrayview.h"
 #include "qstring.h"
 
+QT_REQUIRE_CONFIG(timezone);
 QT_BEGIN_NAMESPACE
 
 namespace QtTimeZoneCldr {
diff --git a/src/corelib/time/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h
index 0f006a7896..3aa3658c14 100644
--- a/src/corelib/time/qtimezoneprivate_p.h
+++ b/src/corelib/time/qtimezoneprivate_p.h
@@ -38,6 +38,7 @@ Q_FORWARD_DECLARE_OBJC_CLASS(NSTimeZone);
 #include <QJniObject>
 #endif
 
+QT_REQUIRE_CONFIG(timezone);
 QT_BEGIN_NAMESPACE
 
 class Q_AUTOTEST_EXPORT QTimeZonePrivate : public QSharedData
diff --git a/tests/auto/corelib/time/CMakeLists.txt b/tests/auto/corelib/time/CMakeLists.txt
index b593cc54d6..f2dfbfa527 100644
--- a/tests/auto/corelib/time/CMakeLists.txt
+++ b/tests/auto/corelib/time/CMakeLists.txt
@@ -6,6 +6,4 @@ add_subdirectory(qdate)
 add_subdirectory(qdatetime)
 add_subdirectory(qdatetimeparser)
 add_subdirectory(qtime)
-if(QT_FEATURE_timezone)
-    add_subdirectory(qtimezone)
-endif()
+add_subdirectory(qtimezone)
diff --git a/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm b/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm
index 6102fd8a60..f4ef15036d 100644
--- a/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm
+++ b/tests/auto/corelib/time/qtimezone/tst_qtimezone_darwin.mm
@@ -9,7 +9,7 @@
 
 void tst_QTimeZone_darwinTypes()
 {
-#if !defined(QT_NO_SYSTEMLOCALE)
+#if QT_CONFIG(timezone)
     // QTimeZone <-> CFTimeZone
     {
         QTimeZone qtTimeZone("America/Los_Angeles");
@@ -39,5 +39,5 @@ void tst_QTimeZone_darwinTypes()
         QVERIFY([qtTimeZone.toNSTimeZone() isEqual:nsTimeZone]);
         [autoreleasepool release];
     }
-#endif
+#endif // feature timezone
 }