diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f7e7b7a5a..70c3f5f39a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### changes
 
+- Adding "configtest" CLI command.
+
 ## 0.20.0 (2023-02-03)
 
 ### changes
diff --git a/cmd/headscale/cli/configtest.go b/cmd/headscale/cli/configtest.go
new file mode 100644
index 0000000000..37b77848ce
--- /dev/null
+++ b/cmd/headscale/cli/configtest.go
@@ -0,0 +1,22 @@
+package cli
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/rs/zerolog/log"
+)
+
+func init() {
+	rootCmd.AddCommand(configTestCmd)
+}
+
+var configTestCmd = &cobra.Command{
+	Use:   "configtest",
+	Short: "Test the configuration.",
+	Long:  "Run a test of the configuration and exit.",
+	Run: func(cmd *cobra.Command, args []string) {
+		_, err := getHeadscaleApp()
+		if err != nil {
+			log.Fatal().Caller().Err(err).Msg("Error initializing")
+		}
+	},
+}