diff --git a/src/util/virjson.c b/src/util/virjson.c
index 40ec613a4f65154bed604a3a885a260d3d4aef56..7d4ece6465ca391096197d552933a3894db64385 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -38,6 +38,7 @@
 #  define yajl_size_t size_t
 # else
 #  define yajl_size_t unsigned int
+#  define yajl_complete_parse yajl_parse_complete
 # endif
 
 #endif
@@ -1610,7 +1611,8 @@ virJSONValueFromString(const char *jsonstring)
 
     if (yajl_parse(hand,
                    (const unsigned char *)jsonstring,
-                   strlen(jsonstring)) != yajl_status_ok) {
+                   strlen(jsonstring)) != yajl_status_ok ||
+        yajl_complete_parse(hand) != yajl_status_ok) {
         unsigned char *errstr = yajl_get_error(hand, 1,
                                                (const unsigned char*)jsonstring,
                                                strlen(jsonstring));
diff --git a/tests/jsontest.c b/tests/jsontest.c
index c08094639e382febbe4ec674be81d57c08696c1e..f226c9251eade233fd60ea9816b2b19d31ad548f 100644
--- a/tests/jsontest.c
+++ b/tests/jsontest.c
@@ -304,6 +304,12 @@ mymain(void)
     DO_TEST_PARSE("string", "[ \"The meaning of life\" ]");
     DO_TEST_PARSE_FAIL("unterminated string", "[ \"The meaning of lif ]");
 
+    DO_TEST_PARSE("integer", "1");
+    DO_TEST_PARSE("boolean", "true");
+    DO_TEST_PARSE("null", "null");
+    DO_TEST_PARSE_FAIL("incomplete keyword", "tr");
+    DO_TEST_PARSE_FAIL("overdone keyword", "truest");
+    DO_TEST_PARSE_FAIL("unknown keyword", "huh");
 
     DO_TEST_PARSE_FAIL("object with numeric keys", "{ 1:1, 2:1, 3:2 }");
     DO_TEST_PARSE_FAIL("unterminated object", "{ \"1\":1, \"2\":1, \"3\":2");