diff --git a/java/org/apache/catalina/valves/JDBCAccessLogValve.java b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
index 0f4d0945b260..8db7569320e3 100644
--- a/java/org/apache/catalina/valves/JDBCAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JDBCAccessLogValve.java
@@ -68,11 +68,11 @@
  * remoteHost CHAR(15) NOT NULL,
  * userName CHAR(15),
  * timestamp TIMESTAMP NOT NULL,
- * virtualHost VARCHAR(64) NOT NULL,
- * method VARCHAR(8) NOT NULL,
  * query VARCHAR(255) NOT NULL,
  * status SMALLINT UNSIGNED NOT NULL,
  * bytes INT UNSIGNED NOT NULL,
+ * virtualHost VARCHAR(64) NOT NULL,
+ * method VARCHAR(8) NOT NULL,
  * referer VARCHAR(128),
  * userAgent VARCHAR(128),
  * PRIMARY KEY (id),
@@ -95,9 +95,6 @@
  * If the request method is "common", only these fields are used:
  * <code>remoteHost, user, timeStamp, query, status, bytes</code>
  * </p>
- * <p>
- * <i>TO DO: provide option for excluding logging of certain MIME types.</i>
- * </p>
  *
  * @author Andre de Jesus
  * @author Peter Rossbach
diff --git a/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
new file mode 100644
index 000000000000..1c0c1436158d
--- /dev/null
+++ b/test/org/apache/catalina/valves/TestJDBCAccessLogValve.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.valves;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import org.apache.catalina.Context;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+@RunWith(Parameterized.class)
+public class TestJDBCAccessLogValve extends TomcatBaseTest {
+
+    public static final String SCHEMA =
+            "CREATE TABLE access (\n" +
+            "  id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY(Start with 1, Increment by 1),\n" +
+            "  remoteHost CHAR(15) NOT NULL,\n" +
+            "  userName CHAR(15),\n" +
+            "  timestamp TIMESTAMP NOT NULL,\n" +
+            "  query VARCHAR(255),\n" +
+            "  status SMALLINT NOT NULL,\n" +
+            "  bytes INT NOT NULL,\n" +
+            "  virtualHost VARCHAR(64),\n" +
+            "  method VARCHAR(8),\n" +
+            "  referer VARCHAR(128),\n" +
+            "  userAgent VARCHAR(128)\n" +
+            ")";
+
+    @Parameterized.Parameters(name = "{index}: logPattern[{0}]")
+    public static Collection<Object[]> parameters() {
+        List<Object[]> parameterSets = new ArrayList<>();
+
+        parameterSets.add(new Object[] {"common"});
+        parameterSets.add(new Object[] {"combined"});
+
+        return parameterSets;
+    }
+
+    @Parameter(0)
+    public String logPattern;
+
+    @Test
+    public void testValve() throws Exception {
+
+        String connectionURL = "jdbc:derby:" + getTemporaryDirectory().getAbsolutePath() + "/" + logPattern;
+
+        Class.forName("org.apache.derby.jdbc.EmbeddedDriver");
+        try (Connection connection = DriverManager.getConnection(connectionURL + ";create=true");
+                Statement statement = connection.createStatement()) {
+            statement.execute(SCHEMA);
+        }
+
+        Tomcat tomcat = getTomcatInstance();
+        // No file system docBase required
+        Context ctx = getProgrammaticRootContext();
+
+        JDBCAccessLogValve accessLogValve = new JDBCAccessLogValve();
+        accessLogValve.setDriverName("org.apache.derby.jdbc.EmbeddedDriver");
+        accessLogValve.setConnectionURL(connectionURL);
+        accessLogValve.setPattern(logPattern);
+        ctx.getParent().getPipeline().addValve(accessLogValve);
+
+        tomcat.start();
+
+        ByteChunk result = new ByteChunk();
+        int rc = getUrl("http://localhost:" + getPort() + "/test1", result, null);
+        Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+        result.recycle();
+
+        rc = getUrl("http://localhost:" + getPort() + "/test2?foo=bar", result, null);
+        Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rc);
+
+        tomcat.stop();
+
+        try (Connection connection = DriverManager.getConnection(connectionURL);
+                Statement statement = connection.createStatement()) {
+            statement.execute("SELECT * FROM access");
+            ResultSet rs = statement.getResultSet();
+            Assert.assertTrue(rs.next());
+            Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rs.getInt("status"));
+            Assert.assertEquals("/test1", rs.getString("query"));
+            Assert.assertTrue(rs.next());
+            Assert.assertEquals(HttpServletResponse.SC_NOT_FOUND, rs.getInt("status"));
+            Assert.assertEquals("/test2", rs.getString("query"));
+        }
+
+    }
+
+}