diff --git a/cli/templatepush.go b/cli/templatepush.go
index af87fbc446af8..eb076b213404c 100644
--- a/cli/templatepush.go
+++ b/cli/templatepush.go
@@ -85,8 +85,13 @@ func (pf *templateUploadFlags) templateName(args []string) (string, error) {
 	if len(args) > 0 {
 		return args[0], nil
 	}
+	// Have to take absPath to resolve "." and "..".
+	absPath, err := filepath.Abs(pf.directory)
+	if err != nil {
+		return "", err
+	}
 	// If no name is provided, use the directory name.
-	return filepath.Base(pf.directory), nil
+	return filepath.Base(absPath), nil
 }
 
 func (r *RootCmd) templatePush() *clibase.Cmd {
diff --git a/cli/templatepush_test.go b/cli/templatepush_test.go
index 19a4c561b78ab..0f7eca58d1cdc 100644
--- a/cli/templatepush_test.go
+++ b/cli/templatepush_test.go
@@ -155,8 +155,9 @@ func TestTemplatePush(t *testing.T) {
 		require.Equal(t, "example", templateVersions[1].Name)
 	})
 
+	// This test modifies the working directory.
+	//nolint:paralleltest
 	t.Run("UseWorkingDir", func(t *testing.T) {
-		t.Parallel()
 		client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
 		user := coderdtest.CreateFirstUser(t, client)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
@@ -173,9 +174,18 @@ func TestTemplatePush(t *testing.T) {
 				r.Name = filepath.Base(source)
 			})
 
+		oldDir, err := os.Getwd()
+		require.NoError(t, err)
+
+		os.Chdir(source)
+
+		t.Cleanup(func() {
+			os.Chdir(oldDir)
+		})
+
 		// Don't pass the name of the template, it should use the
 		// directory of the source.
-		inv, root := clitest.New(t, "templates", "push", "--directory", source, "--test.provisioner", string(database.ProvisionerTypeEcho))
+		inv, root := clitest.New(t, "templates", "push", "--test.provisioner", string(database.ProvisionerTypeEcho))
 		clitest.SetupConfig(t, client, root)
 		pty := ptytest.New(t).Attach(inv)
 
diff --git a/codersdk/organizations.go b/codersdk/organizations.go
index c2322425402af..b59e52a37c058 100644
--- a/codersdk/organizations.go
+++ b/codersdk/organizations.go
@@ -221,6 +221,9 @@ func (c *Client) TemplatesByOrganization(ctx context.Context, organizationID uui
 
 // TemplateByName finds a template inside the organization provided with a case-insensitive name.
 func (c *Client) TemplateByName(ctx context.Context, organizationID uuid.UUID, name string) (Template, error) {
+	if name == "" {
+		return Template{}, xerrors.Errorf("template name cannot be empty")
+	}
 	res, err := c.Request(ctx, http.MethodGet,
 		fmt.Sprintf("/api/v2/organizations/%s/templates/%s", organizationID.String(), name),
 		nil,