diff --git a/certs.go b/certs.go
index 7c57f4932..f87bde0d1 100644
--- a/certs.go
+++ b/certs.go
@@ -19,8 +19,6 @@ package main
 import (
 	"os"
 	"path/filepath"
-
-	"github.com/minio/go-homedir"
 )
 
 // createCertsPath create certs path.
@@ -34,11 +32,12 @@ func createCertsPath() error {
 
 // getCertsPath get certs path.
 func getCertsPath() (string, error) {
-	homeDir, err := homedir.Dir()
+	var certsPath string
+	configDir, err := getConfigPath()
 	if err != nil {
 		return "", err
 	}
-	certsPath := filepath.Join(homeDir, globalMinioCertsDir)
+	certsPath = filepath.Join(configDir, globalMinioCertsDir)
 	return certsPath, nil
 }
 
diff --git a/globals.go b/globals.go
index 0ffb61a6f..431568159 100644
--- a/globals.go
+++ b/globals.go
@@ -27,7 +27,7 @@ const (
 const (
 	globalMinioConfigVersion = "4"
 	globalMinioConfigDir     = ".minio"
-	globalMinioCertsDir      = ".minio/certs"
+	globalMinioCertsDir      = "certs"
 	globalMinioCertFile      = "public.crt"
 	globalMinioKeyFile       = "private.key"
 	globalMinioConfigFile    = "config.json"