diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt
index eb9a7a0f..0bb240cf 100644
--- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt
+++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt
@@ -150,6 +150,17 @@ class DownloadStatsPathTest : BaseTest() {
         }
     }
 
+    @Test
+    fun badTotalVersionReturnsSaneData() {
+        runBlocking {
+            RestAssured.given()
+                    .`when`()
+                    .get("/v3/stats/downloads/total/101")
+                    .then()
+                    .statusCode(400)
+        }
+    }
+
     @Test
     fun totalTagReturnsSaneData() {
         runBlocking {
@@ -171,6 +182,17 @@ class DownloadStatsPathTest : BaseTest() {
         }
     }
 
+    @Test
+    fun badTotalTagReturnsSaneData() {
+        runBlocking {
+            RestAssured.given()
+                    .`when`()
+                    .get("/v3/stats/downloads/total/101/fooBar")
+                    .then()
+                    .statusCode(400)
+        }
+    }
+
     @Test
     fun trackingReturnsSaneData() {
         runBlocking {
diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt
index 6dcf73ad..9145e1de 100644
--- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt
+++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt
@@ -38,4 +38,24 @@ class VersionPathTest {
                 .statusCode(200)
                 .body(VersionDataMatcher(parsed))
     }
+
+    @Test
+    fun parsesNoVersion() {
+
+        RestAssured.given()
+                .`when`()
+                .get("/v3/version/")
+                .then()
+                .statusCode(404)
+    }
+
+    @Test
+    fun parsesBadVersion() {
+
+        RestAssured.given()
+                .`when`()
+                .get("/v3/version/fooBar")
+                .then()
+                .statusCode(400)
+    }
 }