diff --git a/tests/src/core/Makefile.am b/tests/src/core/Makefile.am
index a89f20b8af4..ebbe001979d 100644
--- a/tests/src/core/Makefile.am
+++ b/tests/src/core/Makefile.am
@@ -9,6 +9,7 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 bin_PROGRAMS = testqgsapplication \
+		testqgsfeature \
 		testqgsfield \
                testqgssymbol
 
@@ -27,6 +28,7 @@ GLOBALCXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(P
 	$(MOC) -o $@ $<
 
 BUILT_SOURCES = $(testqgsapplication_MOC) \
+		$(testqgsfeature_MOC) \
 		$(testqgsfield_MOC) \
                 $(testqgssymbol_MOC)
 
@@ -51,3 +53,8 @@ testqgsfield_MOC = testqgsfield.moc.cpp
 testqgsfield_SOURCES = testqgsfield.cpp
 testqgsfield_LDADD = $(GLOBALLDADD)
 testqgsfield_CXXFLAGS =  $(GLOBALCXXFLAGS)
+
+testqgsfeature_MOC = testqgsfeature.moc.cpp
+testqgsfeature_SOURCES = testqgsfeature.cpp
+testqgsfeature_LDADD = $(GLOBALLDADD)
+testqgsfeature_CXXFLAGS =  $(GLOBALCXXFLAGS)
diff --git a/tests/src/core/testqgsfeature.cpp b/tests/src/core/testqgsfeature.cpp
new file mode 100644
index 00000000000..cf02a8f0745
--- /dev/null
+++ b/tests/src/core/testqgsfeature.cpp
@@ -0,0 +1,168 @@
+#include <QtTest>
+#include <QObject>
+#include <QString>
+#include <QObject>
+//header for class being tested
+#include <qgsfeature.h>
+
+class TestQgsFeature: public QObject
+{
+  Q_OBJECT;
+  private slots:
+        void QgsFeatureQgsFeature()
+{
+
+};
+    void QgsFeaturefeatureId()
+{
+
+};
+    void QgsFeatureattributeMap()
+{
+
+};
+    void QgsFeatureaddAttribute()
+{
+
+};
+    void QgsFeaturedeleteAttribute()
+{
+
+};
+    void QgsFeaturechangeAttributeValue()
+{
+
+};
+    void QgsFeaturechangeAttributeName()
+{
+
+};
+    void QgsFeaturefields()
+{
+
+};
+    void QgsFeaturegeometry()
+{
+
+};
+    void QgsFeaturegeometryAndOwnership()
+{
+
+};
+    void QgsFeaturegetGeometry()
+{
+
+};
+    void QgsFeaturegetCommittedGeometry()
+{
+
+};
+    void QgsFeaturegetModifiedGeometry()
+{
+
+};
+    void QgsFeaturegetGeometrySize()
+{
+
+};
+    void QgsFeaturegetCommittedGeometrySize()
+{
+
+};
+    void QgsFeaturegetModifiedGeometrySize()
+{
+
+};
+    void QgsFeaturewellKnownText()
+{
+
+};
+    void QgsFeaturesetFeatureId()
+{
+
+};
+    void QgsFeaturetypeName()
+{
+
+};
+    void QgsFeaturesetGeometry()
+{
+
+};
+    void QgsFeaturesetGeometryAndOwnership()
+{
+
+};
+    void QgsFeaturesetModifiedGeometry()
+{
+
+};
+    void QgsFeatureinsertVertexBefore()
+{
+
+};
+    void QgsFeaturemoveVertexAt()
+{
+
+};
+    void QgsFeaturevertexAt()
+{
+
+};
+    void QgsFeatureisValid()
+{
+
+};
+    void QgsFeaturesetValid()
+{
+
+};
+    void QgsFeatureisDirty()
+{
+
+};
+    void QgsFeatureresetDirty()
+{
+
+};
+    void QgsFeatureintersects()
+{
+
+};
+    void QgsFeatureexportToWKT()
+{
+
+};
+    void QgsFeatureclosestVertex()
+{
+
+};
+    void QgsFeaturedistanceSquaredPointToSegment()
+{
+
+};
+    void QgsFeatureclosestSegmentWithContext()
+{
+
+};
+    void QgsFeatureclosestSegment()
+{
+
+};
+    void QgsFeatureboundingBox()
+{
+
+};
+    void QgsFeaturegeosGeometry()
+{
+
+};
+
+};
+
+QTEST_MAIN(TestQgsFeature)
+#include "testqgsfeature.moc.cpp"
+
+
+
+