diff --git a/pkg/user/user_test.go b/pkg/user/user_test.go
index 8536071ff..ac538f12a 100644
--- a/pkg/user/user_test.go
+++ b/pkg/user/user_test.go
@@ -19,7 +19,6 @@ package user
 
 import (
 	"code.vikunja.io/api/pkg/db"
-	"code.vikunja.io/api/pkg/utils"
 	"github.com/stretchr/testify/assert"
 	"testing"
 )
@@ -215,48 +214,50 @@ func TestListUsers(t *testing.T) {
 		assert.Equal(t, all[0].Username, "user1")
 	})
 	t.Run("all users", func(t *testing.T) {
+		db.LoadAndAssertFixtures(t)
 		all, err := ListUsers("")
 		assert.NoError(t, err)
 		assert.Len(t, all, 13)
 	})
 }
 
-/*
 func TestUserPasswordReset(t *testing.T) {
-
-	db.LoadAndAssertFixtures(t)
-
-	// Request a new token
-	tr := &PasswordTokenRequest{
-		Email: "user1@example.com",
-	}
-	err := RequestUserPasswordResetToken(tr)
-	assert.NoError(t, err)
-
-	// Get the token / inside the user object
-	userWithToken, err := GetUserByID(1)
-	assert.NoError(t, err)
-
-	// Try resetting it
-	reset := &PasswordReset{
-		Token: userWithToken.PasswordResetToken,
-	}
-
-	// Try resetting it without a password
-	reset.NewPassword = ""
-	err = ResetPassword(reset)
-	assert.True(t, IsErrNoUsernamePassword(err))
-
-	// Reset it
-	reset.NewPassword = "1234"
-	err = ResetPassword(reset)
-	assert.NoError(t, err)
-
-	// Try resetting it with a wrong token
-	reset.Token = utils.MakeRandomString(400)
-	err = ResetPassword(reset)
-	assert.Error(t, err)
-	assert.True(t, IsErrInvalidPasswordResetToken(err))
+	t.Run("normal", func(t *testing.T) {
+		db.LoadAndAssertFixtures(t)
+		reset := &PasswordReset{
+			Token:       "passwordresettesttoken",
+			NewPassword: "12345",
+		}
+		err := ResetPassword(reset)
+		assert.NoError(t, err)
+	})
+	t.Run("without password", func(t *testing.T) {
+		db.LoadAndAssertFixtures(t)
+		reset := &PasswordReset{
+			Token: "passwordresettesttoken",
+		}
+		err := ResetPassword(reset)
+		assert.Error(t, err)
+		assert.True(t, IsErrNoUsernamePassword(err))
+	})
+	t.Run("empty token", func(t *testing.T) {
+		db.LoadAndAssertFixtures(t)
+		reset := &PasswordReset{
+			Token:       "somethingsomething",
+			NewPassword: "12345",
+		}
+		err := ResetPassword(reset)
+		assert.Error(t, err)
+		assert.True(t, IsErrInvalidPasswordResetToken(err))
+	})
+	t.Run("wrong token", func(t *testing.T) {
+		db.LoadAndAssertFixtures(t)
+		reset := &PasswordReset{
+			Token:       "somethingsomething",
+			NewPassword: "12345",
+		}
+		err := ResetPassword(reset)
+		assert.Error(t, err)
+		assert.True(t, IsErrInvalidPasswordResetToken(err))
+	})
 }
-
-*/