diff --git a/src/Unittests/unittests_trimesh_circulator_face_vertex.hh b/src/Unittests/unittests_trimesh_circulator_face_vertex.hh
index c3f900ff..703aac29 100644
--- a/src/Unittests/unittests_trimesh_circulator_face_vertex.hh
+++ b/src/Unittests/unittests_trimesh_circulator_face_vertex.hh
@@ -30,3 +30,95 @@ class OpenMeshTrimeshCirculatorFaceVertex : public OpenMeshBase {
  */
 
 
+
+/*
+ * Small FaceVertexIterator Test
+ */
+TEST_F(OpenMeshTrimeshCirculatorFaceVertex, FaceVertexIterWithoutIncrement) {
+
+  mesh_.clear();
+
+  // Add some vertices
+  Mesh::VertexHandle vhandle[5];
+
+  vhandle[0] = mesh_.add_vertex(Mesh::Point(0, 1, 0));
+  vhandle[1] = mesh_.add_vertex(Mesh::Point(1, 0, 0));
+  vhandle[2] = mesh_.add_vertex(Mesh::Point(2, 1, 0));
+  vhandle[3] = mesh_.add_vertex(Mesh::Point(0,-1, 0));
+  vhandle[4] = mesh_.add_vertex(Mesh::Point(2,-1, 0));
+
+  // Add two faces
+  std::vector<Mesh::VertexHandle> face_vhandles;
+
+  face_vhandles.push_back(vhandle[0]);
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[2]);
+  Mesh::FaceHandle fh0 = mesh_.add_face(face_vhandles);
+
+  face_vhandles.clear();
+
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[3]);
+  face_vhandles.push_back(vhandle[4]);
+  mesh_.add_face(face_vhandles);
+
+  face_vhandles.clear();
+
+  face_vhandles.push_back(vhandle[0]);
+  face_vhandles.push_back(vhandle[3]);
+  face_vhandles.push_back(vhandle[1]);
+  mesh_.add_face(face_vhandles);
+
+  face_vhandles.clear();
+
+  face_vhandles.push_back(vhandle[2]);
+  face_vhandles.push_back(vhandle[1]);
+  face_vhandles.push_back(vhandle[4]);
+  mesh_.add_face(face_vhandles);
+
+  /* Test setup:
+      0 ==== 2
+      |\  0 /|
+      | \  / |
+      |2  1 3|
+      | /  \ |
+      |/  1 \|
+      3 ==== 4 */
+
+
+  // Check face handle index
+  EXPECT_EQ(0, fh0.idx() ) << "Index wrong in FaceVertexIter at initialization";
+
+  // Iterate around vertex 1 at the middle (with holes in between)
+  Mesh::FaceVertexIter fv_it  = mesh_.fv_begin(fh0);
+  Mesh::FaceVertexIter fv_end = mesh_.fv_end(fh0);
+  EXPECT_EQ(0, fv_it.handle().idx() ) << "Index wrong in FaceVertexIter at initialization";
+  EXPECT_TRUE(fv_it) << "Iterator invalid in FaceVertexIter at initialization";
+  ++fv_it ;
+  EXPECT_EQ(1, fv_it.handle().idx() ) << "Index wrong in FaceVertexIter at step 1";
+  EXPECT_TRUE(fv_it) << "Iterator invalid in FaceVertexIter at step 1";
+  ++fv_it ;
+  EXPECT_EQ(2, fv_it.handle().idx() ) << "Index wrong in FaceVertexIter at step 2";
+  EXPECT_TRUE(fv_it) << "Iterator invalid in FaceVertexIter at step 2";
+  ++fv_it ;
+  EXPECT_EQ(0, fv_it.handle().idx() ) << "Index wrong in FaceVertexIter at step 3";
+  EXPECT_FALSE(fv_it) << "Iterator invalid in FaceVertexIter at step 3";
+  EXPECT_TRUE( fv_it == fv_end )  << "End iterator for FaceVertexIter not matching";
+
+  // Iterate around vertex 1 at the middle (with holes in between) with const iterator
+  Mesh::ConstFaceVertexIter cfv_it   = mesh_.cfv_begin(fh0);
+  Mesh::ConstFaceVertexIter cfv_end  = mesh_.cfv_end(fh0);
+  EXPECT_EQ(0, cfv_it.handle().idx() ) << "Index wrong in ConstFaceVertexIter at initialization";
+  EXPECT_TRUE(cfv_it) << "Iterator invalid in ConstFaceVertexIter at initialization";
+  ++cfv_it ;
+  EXPECT_EQ(1, cfv_it.handle().idx() ) << "Index wrong in ConstFaceVertexIter at step 1";
+  EXPECT_TRUE(cfv_it) << "Iterator invalid in ConstFaceVertexIter at step 1";
+  ++cfv_it ;
+  EXPECT_EQ(2, cfv_it.handle().idx() ) << "Index wrong in ConstFaceVertexIter at step 2";
+  EXPECT_TRUE(cfv_it) << "Iterator invalid in ConstFaceVertexIter at step 2";
+  ++cfv_it ;
+  EXPECT_EQ(0, cfv_it.handle().idx() ) << "Index wrong in ConstFaceVertexIter at step 3";
+  EXPECT_FALSE(cfv_it) << "Iterator invalid in ConstFaceVertexIter at step 3";
+  EXPECT_TRUE( cfv_it == cfv_end )  << "End iterator for ConstFaceVertexIter not matching";
+
+}