diff --git a/backend/internal/api/handlers/crowdsec_whitelist_handler_test.go b/backend/internal/api/handlers/crowdsec_whitelist_handler_test.go
index 8e932806..dc03065b 100644
--- a/backend/internal/api/handlers/crowdsec_whitelist_handler_test.go
+++ b/backend/internal/api/handlers/crowdsec_whitelist_handler_test.go
@@ -54,7 +54,7 @@ func TestListWhitelists_Empty(t *testing.T) {
 	assert.Equal(t, http.StatusOK, w.Code)
 	var resp map[string]interface{}
 	require.NoError(t, json.Unmarshal(w.Body.Bytes(), &resp))
-	entries, ok := resp["entries"].([]interface{})
+	entries, ok := resp["whitelist"].([]interface{})
 	assert.True(t, ok)
 	assert.Empty(t, entries)
 }
@@ -154,6 +154,22 @@ func TestListWhitelists_AfterAdd(t *testing.T) {
 	assert.Equal(t, http.StatusOK, w.Code)
 	var resp map[string]interface{}
 	require.NoError(t, json.Unmarshal(w.Body.Bytes(), &resp))
-	entries := resp["entries"].([]interface{})
+	entries := resp["whitelist"].([]interface{})
 	assert.Len(t, entries, 1)
 }
+
+func TestAddWhitelist_400_MissingField(t *testing.T) {
+	t.Parallel()
+	_, r, _ := setupWhitelistHandler(t)
+
+	body := `{}`
+	w := httptest.NewRecorder()
+	req := httptest.NewRequest(http.MethodPost, "/api/v1/admin/crowdsec/whitelist", bytes.NewBufferString(body))
+	req.Header.Set("Content-Type", "application/json")
+	r.ServeHTTP(w, req)
+
+	assert.Equal(t, http.StatusBadRequest, w.Code)
+	var resp map[string]interface{}
+	require.NoError(t, json.Unmarshal(w.Body.Bytes(), &resp))
+	assert.Equal(t, "ip_or_cidr is required", resp["error"])
+}
diff --git a/backend/internal/services/crowdsec_whitelist_service_test.go b/backend/internal/services/crowdsec_whitelist_service_test.go
index 438221f2..9d52016f 100644
--- a/backend/internal/services/crowdsec_whitelist_service_test.go
+++ b/backend/internal/services/crowdsec_whitelist_service_test.go
@@ -164,3 +164,16 @@ func TestCrowdSecWhitelistService_List_AfterAdd(t *testing.T) {
 	require.NoError(t, err)
 	assert.Len(t, entries, 3)
 }
+
+func TestAdd_ValidIPv6_Success(t *testing.T) {
+	t.Parallel()
+	svc := services.NewCrowdSecWhitelistService(openWhitelistTestDB(t), "")
+	entry, err := svc.Add(context.Background(), "2001:db8::1", "ipv6 test")
+	require.NoError(t, err)
+	assert.Equal(t, "2001:db8::1", entry.IPOrCIDR)
+
+	entries, err := svc.List(context.Background())
+	require.NoError(t, err)
+	assert.Len(t, entries, 1)
+	assert.Equal(t, "2001:db8::1", entries[0].IPOrCIDR)
+}