diff --git a/cmd/kubectl-k8ssandra/register/command_test.go b/cmd/kubectl-k8ssandra/register/command_test.go
new file mode 100644
index 0000000..2eb281c
--- /dev/null
+++ b/cmd/kubectl-k8ssandra/register/command_test.go
@@ -0,0 +1,64 @@
+package register
+
+import (
+	"testing"
+
+	"github.com/spf13/cobra"
+	"github.com/stretchr/testify/require"
+	"k8s.io/cli-runtime/pkg/genericiooptions"
+)
+
+func TestInputParameters(t *testing.T) {
+	require := require.New(t)
+
+	var executor *RegistrationExecutor
+
+	RegisterClusterCmd.RunE = func(cmd *cobra.Command, args []string) error {
+		executor = NewRegistrationExecutorFromRegisterClusterCmd(*cmd)
+		return nil
+	}
+	cmd := &cobra.Command{}
+	SetupRegisterClusterCmd(cmd, genericiooptions.NewTestIOStreamsDiscard())
+	cmd.Root().SetArgs([]string{
+		"register",
+		"--source-context", "source-ctx",
+		"--source-kubeconfig", "testsourcekubeconfig",
+		"--dest-kubeconfig", "testdestkubeconfig",
+		"--dest-context", "dest-ctx",
+		"--source-namespace", "source-namespace",
+		"--dest-namespace", "dest-namespace",
+		"--serviceaccount-name", "test-sa",
+		"--override-src-ip", "127.0.0.2",
+		"--override-src-port", "9999"})
+
+	require.NoError(cmd.Execute())
+
+	require.Equal("127.0.0.2", executor.OverrideSourceIP)
+	require.Equal("9999", executor.OverrideSourcePort)
+	require.Equal("testsourcekubeconfig", executor.SourceKubeconfig)
+	require.Equal("source-ctx", executor.SourceContext)
+	require.Equal("testdestkubeconfig", executor.DestKubeconfig)
+	require.Equal("dest-ctx", executor.DestContext)
+	require.Equal("source-namespace", executor.SourceNamespace)
+	require.Equal("dest-namespace", executor.DestNamespace)
+	require.Equal("test-sa", executor.ServiceAccount)
+}
+
+func TestIncorrectParameters(t *testing.T) {
+	require := require.New(t)
+
+	RegisterClusterCmd.RunE = func(cmd *cobra.Command, args []string) error {
+		return nil
+	}
+	cmd := &cobra.Command{}
+	cmd.SilenceUsage = true
+	SetupRegisterClusterCmd(cmd, genericiooptions.NewTestIOStreamsDiscard())
+	cmd.Root().SetArgs([]string{
+		"register",
+		"--service-account", "test-sa",
+	})
+
+	err := cmd.Execute()
+	require.Error(err)
+	require.Equal("unknown flag: --service-account", err.Error())
+}
diff --git a/cmd/kubectl-k8ssandra/register/register_test.go b/cmd/kubectl-k8ssandra/register/register_test.go
index 9954a19..d358d4f 100644
--- a/cmd/kubectl-k8ssandra/register/register_test.go
+++ b/cmd/kubectl-k8ssandra/register/register_test.go
@@ -7,13 +7,11 @@ import (
 	"time"
 
 	configapi "github.com/k8ssandra/k8ssandra-operator/apis/config/v1beta1"
-	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -140,39 +138,3 @@ func ClientConfigFromSecret(s *corev1.Secret) (clientcmdapi.Config, error) {
 	}
 	return *out, nil
 }
-
-func TestInputParameters(t *testing.T) {
-	require := require.New(t)
-
-	RegisterClusterCmd.RunE = func(cmd *cobra.Command, args []string) error {
-		return nil
-	}
-	cmd := &cobra.Command{
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return nil
-		},
-	}
-	SetupRegisterClusterCmd(cmd, genericiooptions.NewTestIOStreamsDiscard())
-	RegisterClusterCmd.SetArgs([]string{
-		"register",
-		"--source-context", "source-ctx",
-		"--source-kubeconfig", "testsourcekubeconfig",
-		"dest-kubeconfig", "testdestkubeconfig",
-		"--dest-context", "dest-ctx",
-		"--source-namespace", "source-namespace",
-		"--source-namespace", "dest-namespace",
-		"--service-account", "test-sa",
-		"--override-src-ip", "127.0.0.2",
-		"--override-src-port", "9999"})
-	executor := NewRegistrationExecutorFromRegisterClusterCmd(*RegisterClusterCmd)
-	require.NoError(RegisterClusterCmd.Execute())
-	require.Equal("127.0.0.2", executor.OverrideSourceIP)
-	require.Equal("9999", executor.OverrideSourcePort)
-	require.Equal("testsourcekubeconfig", executor.SourceKubeconfig)
-	require.Equal("source-ctx", executor.SourceContext)
-	require.Equal("testdestkubeconfig", executor.DestKubeconfig)
-	require.Equal("dest-ctx", executor.DestContext)
-	require.Equal("source-namespace", executor.SourceNamespace)
-	require.Equal("dest-namespace", executor.DestNamespace)
-	require.Equal("test-sa", executor.ServiceAccount)
-}