diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index 040c1b187..ae81fec24 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -1110,10 +1110,10 @@ This should be a lot faster than the `parse-time-string'."
   (unless (string-match org-ts-regexp0 s)
     (error "Not an Org time string: %s" s))
   (list 0
-	(cond ((match-beginning 8) (string-to-number (match-string 8)))
+	(cond ((match-beginning 8) (string-to-number (match-string 8 s)))
 	      (nodefault nil)
 	      (t 0))
-	(cond ((match-beginning 7) (string-to-number (match-string 7)))
+	(cond ((match-beginning 7) (string-to-number (match-string 7 s)))
 	      (nodefault nil)
 	      (t 0))
 	(string-to-number (match-string 4 s))
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index d653a29f2..2155f270a 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -2402,7 +2402,7 @@ Outside list"
 
 ;;;; Timestamp
 
-(ert-deftest test-org-element/timestamp ()
+(ert-deftest test-org-element/timestamp-parser ()
   "Test `timestamp' parser."
   ;; Active timestamp.
   (should