diff --git a/Makefile b/Makefile
index 3c2d57b..7633c0c 100644
--- a/Makefile
+++ b/Makefile
@@ -46,8 +46,8 @@ libupdfparser.a: $(OBJECTS)
 libupdfparser.so: $(OBJECTS)
 	$(CXX) obj/*.o $(LDFLAGS) -o $@ -shared
 
-test: test.c libupdfparser.a
+test: tests/test.cpp libupdfparser.a
 	g++ -ggdb -O0 $^ -o $@ -Iinclude libupdfparser.a
 
 clean:
-	rm -rf libupdfparser.so libupdfparser.a obj
+	rm -rf libupdfparser.so libupdfparser.a obj test
diff --git a/tests/test.cpp b/tests/test.cpp
new file mode 100644
index 0000000..0b008d4
--- /dev/null
+++ b/tests/test.cpp
@@ -0,0 +1,27 @@
+#include <iostream>
+#include <uPDFParser.h>
+#include <uPDFParser_common.h>
+
+int main(int argc, char** argv)
+{
+    uPDFParser::Parser parser;
+
+    if (argc != 2 || std::string(argv[1]) == "-h" || std::string(argv[1]) == "--help")
+    {
+        std::cout << "Usage : " << argv[0] << " <file>" << std::endl;
+        return 0;
+    }
+
+    std::cout << "Parse " << argv[1] << std::endl;
+    try
+    {
+        parser.parse(argv[1]);
+    }
+    catch(uPDFParser::Exception e)
+    {
+	std::cout << e.what() << std::endl;
+	return -1;
+    }
+
+    return 0;
+}