diff --git a/dune/functions/functionspacebases/test/CMakeLists.txt b/dune/functions/functionspacebases/test/CMakeLists.txt
index 4f3490af911607c638fd0555cb44c58b26ccf8d7..5061b2ce4907cb6dd225eea3367c0fa11b83ddce 100644
--- a/dune/functions/functionspacebases/test/CMakeLists.txt
+++ b/dune/functions/functionspacebases/test/CMakeLists.txt
@@ -7,6 +7,8 @@ dune_add_test(SOURCES brezzidouglasmarinibasistest.cc)
 
 dune_add_test(SOURCES gridviewfunctionspacebasistest.cc)
 
+dune_add_test(SOURCES pq1nodalbasistest.cc)
+
 dune_add_test(SOURCES taylorhoodbasistest.cc)
 
 dune_add_test(SOURCES rannacherturekbasistest.cc)
diff --git a/dune/functions/functionspacebases/test/pq1nodalbasistest.cc b/dune/functions/functionspacebases/test/pq1nodalbasistest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fa1e6d832e718775eb2821bd5e2d5e7f847aacd1
--- /dev/null
+++ b/dune/functions/functionspacebases/test/pq1nodalbasistest.cc
@@ -0,0 +1,56 @@
+// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+// vi: set et ts=4 sw=2 sts=2:
+#include <config.h>
+
+#include <iostream>
+
+#include <dune/common/exceptions.hh>
+#include <dune/common/parallel/mpihelper.hh>
+
+#include <dune/grid/yaspgrid.hh>
+
+#include <dune/functions/functionspacebases/pq1nodalbasis.hh>
+
+#include <dune/functions/functionspacebases/test/basistest.hh>
+
+using namespace Dune;
+using namespace Dune::Functions;
+
+int main (int argc, char* argv[])
+{
+  Dune::MPIHelper::instance(argc, argv);
+
+  Dune::TestSuite test;
+
+
+
+  // Generate grid for testing
+  const int dim = 2;
+  typedef YaspGrid<dim> GridType;
+  FieldVector<double,dim> l(1);
+  std::array<int,dim> elements = {{10, 10}};
+  GridType grid(l,elements);
+
+
+
+  // check PQ1NodalBasis created 'manually'
+  {
+    typedef GridType::LeafGridView GridView;
+    const GridView& gridView = grid.leafGridView();
+    PQ1NodalBasis<GridView> basis(gridView);
+    test.subTest(checkBasis(basis));
+  }
+
+
+
+  // check PQ1NodalBasis created using basis builder mechanism
+  {
+    using namespace Functions::BasisBuilder;
+    auto basis = makeBasis(grid.leafGridView(), pq1Nodal());
+    test.subTest(checkBasis(basis));
+  }
+
+
+
+  return test.exit();
+}