diff --git a/python/core/raster/qgsrasteriterator.sip b/python/core/raster/qgsrasteriterator.sip
index b0129396a93..3b7b56ca62b 100644
--- a/python/core/raster/qgsrasteriterator.sip
+++ b/python/core/raster/qgsrasteriterator.sip
@@ -39,4 +39,7 @@ class QgsRasterIterator
 
     void setMaximumTileHeight( int h );
     int maximumTileHeight() const;
+
+    static const int DEFAULT_MAXIMUM_TILE_WIDTH;
+    static const int DEFAULT_MAXIMUM_TILE_HEIGHT;
 };
diff --git a/src/core/raster/qgsrasterdataprovider.h b/src/core/raster/qgsrasterdataprovider.h
index cc69fc7082d..14db90875d5 100644
--- a/src/core/raster/qgsrasterdataprovider.h
+++ b/src/core/raster/qgsrasterdataprovider.h
@@ -38,6 +38,7 @@
 #include "qgsrasterpyramid.h"
 #include "qgsrasterrange.h"
 #include "qgsrectangle.h"
+#include "qgsrasteriterator.h"
 
 class QImage;
 class QByteArray;
@@ -446,14 +447,14 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
      * @see stepHeight()
      * @note added in QGIS 3.0
      */
-    virtual int stepWidth() const { return 2000; }
+    virtual int stepWidth() const { return QgsRasterIterator::DEFAULT_MAXIMUM_TILE_WIDTH; }
 
     /**
      * Step height for raster iterations.
      * @see stepWidth()
      * @note added in QGIS 3.0
      */
-    virtual int stepHeight() const { return 2000; }
+    virtual int stepHeight() const { return QgsRasterIterator::DEFAULT_MAXIMUM_TILE_HEIGHT; }
 
   signals:
 
diff --git a/src/core/raster/qgsrasteriterator.cpp b/src/core/raster/qgsrasteriterator.cpp
index 529c140d088..ec68d4853f7 100644
--- a/src/core/raster/qgsrasteriterator.cpp
+++ b/src/core/raster/qgsrasteriterator.cpp
@@ -21,8 +21,8 @@
 QgsRasterIterator::QgsRasterIterator( QgsRasterInterface* input )
     : mInput( input )
     , mFeedback( nullptr )
-    , mMaximumTileWidth( 2000 )
-    , mMaximumTileHeight( 2000 )
+    , mMaximumTileWidth( DEFAULT_MAXIMUM_TILE_WIDTH )
+    , mMaximumTileHeight( DEFAULT_MAXIMUM_TILE_HEIGHT )
 {
   for ( QgsRasterInterface *ri = input; ri; ri = ri->input() )
   {
diff --git a/src/core/raster/qgsrasteriterator.h b/src/core/raster/qgsrasteriterator.h
index f1248a93e2b..a97c40faae4 100644
--- a/src/core/raster/qgsrasteriterator.h
+++ b/src/core/raster/qgsrasteriterator.h
@@ -68,6 +68,9 @@ class CORE_EXPORT QgsRasterIterator
     void setMaximumTileHeight( int h ) { mMaximumTileHeight = h; }
     int maximumTileHeight() const { return mMaximumTileHeight; }
 
+    static const int DEFAULT_MAXIMUM_TILE_WIDTH = 2000;
+    static const int DEFAULT_MAXIMUM_TILE_HEIGHT = 2000;
+
   private:
     //Stores information about reading of a raster band. Columns and rows are in unsampled coordinates
     struct RasterPartInfo
diff --git a/src/providers/wms/qgswmscapabilities.h b/src/providers/wms/qgswmscapabilities.h
index ac49cb302fc..aa5900ddf58 100644
--- a/src/providers/wms/qgswmscapabilities.h
+++ b/src/providers/wms/qgswmscapabilities.h
@@ -24,6 +24,7 @@
 #include "qgsauthmanager.h"
 #include "qgsraster.h"
 #include "qgsrectangle.h"
+#include "qgsrasteriterator.h"
 
 class QNetworkReply;
 
@@ -569,8 +570,8 @@ class QgsWmsSettings
     /**
      * Step size when iterating the layer
      */
-    int mStepWidth = 2000;
-    int mStepHeight = 2000;
+    int mStepWidth = QgsRasterIterator::DEFAULT_MAXIMUM_TILE_WIDTH;
+    int mStepHeight = QgsRasterIterator::DEFAULT_MAXIMUM_TILE_HEIGHT;
 
     //! Data source URI of the WMS for this layer
     QString mHttpUri;