diff --git a/tests/src/python/test_qgsfeature.py b/tests/src/python/test_qgsfeature.py
index 7af2bf7d0e15..7ec1ec1604ca 100644
--- a/tests/src/python/test_qgsfeature.py
+++ b/tests/src/python/test_qgsfeature.py
@@ -41,11 +41,9 @@ def test_ValidFeature(self):
         myPath = os.path.join(unitTestDataPath(), 'points.shp')
         myLayer = QgsVectorLayer(myPath, 'Points', 'ogr')
         provider = myLayer.dataProvider()
-        allAttrs = provider.attributeIndexes()
-        myLayer.select(allAttrs)
-
+        fit = provider.getFeatures()
         feat = QgsFeature()
-        myLayer.nextFeature(feat)
+        fit.nextFeature(feat)
         myValidValue = feat.isValid()
         myMessage = '\nExpected: %s\nGot: %s' % ("True", myValidValue)
         assert myValidValue == True, myMessage
@@ -54,11 +52,9 @@ def test_Attributes(self):
         myPath = os.path.join(unitTestDataPath(), 'lines.shp')
         myLayer = QgsVectorLayer(myPath, 'Lines', 'ogr')
         provider = myLayer.dataProvider()
-        allAttrs = provider.attributeIndexes()
-        myLayer.select(allAttrs)
+        fit = provider.getFeatures()
         feat = QgsFeature()
-        myLayer.nextFeature(feat)
-
+        fit.nextFeature(feat)
         myAttributes = feat.attributes()
         myExpectedAttributes = [ QVariant("Highway"), QVariant(1) ]
 
@@ -94,4 +90,3 @@ def test_SetGeometry(self):
 
 if __name__ == '__main__':
     unittest.main()
-
diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py
index 760b682eef7b..8349e677f18a 100644
--- a/tests/src/python/test_qgsgeometry.py
+++ b/tests/src/python/test_qgsgeometry.py
@@ -302,10 +302,10 @@ def testClipping(self):
         )
         print 'Clip: %s' % myClipPolygon.exportToWkt()
         writeShape(myMemoryLayer, 'clipGeometryBefore.shp')
-        myMemoryLayer.select(myProvider.attributeIndexes())
+        fit = myProvider.getFeatures()
         myFeatures = []
         myFeature = QgsFeature()
-        while myMemoryLayer.nextFeature(myFeature):
+        while fit.nextFeature(myFeature):
             myGeometry = myFeature.geometry()
             if myGeometry.intersects(myClipPolygon):
                 # Adds nodes where the clip and the line intersec