diff --git a/certs_test.go b/certs_test.go
new file mode 100644
index 000000000..0eb0f043a
--- /dev/null
+++ b/certs_test.go
@@ -0,0 +1,60 @@
+/*
+ * Minio Cloud Storage, (C) 2015, 2016 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package main
+
+import (
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+// Make sure we have a valid certs path.
+func TestGetCertsPath(t *testing.T) {
+	path, err := getCertsPath()
+	if err != nil {
+		t.Error(err)
+	}
+	if path == "" {
+		t.Errorf("expected path to not be an empty string, got: '%s'", path)
+	}
+	// Ensure it contains some sort of path separator.
+	if !strings.ContainsRune(path, os.PathSeparator) {
+		t.Errorf("expected path to contain file separator")
+	}
+	// It should also be an absolute path.
+	if !filepath.IsAbs(path) {
+		t.Errorf("expected path to be an absolute path")
+	}
+
+	// This will error if something goes wrong, so just call it.
+	mustGetCertsPath()
+}
+
+// Ensure that the certificate and key file getters contain their respective
+// file name and endings.
+func TestGetFiles(t *testing.T) {
+	file := mustGetCertFile()
+	if !strings.Contains(file, globalMinioCertFile) {
+		t.Errorf("CertFile does not contain %s", globalMinioCertFile)
+	}
+
+	file = mustGetKeyFile()
+	if !strings.Contains(file, globalMinioKeyFile) {
+		t.Errorf("KeyFile does not contain %s", globalMinioKeyFile)
+	}
+}
diff --git a/trie_test.go b/trie_test.go
new file mode 100644
index 000000000..b6b247fa6
--- /dev/null
+++ b/trie_test.go
@@ -0,0 +1,71 @@
+/*
+ * Minio Cloud Storage, (C) 2016 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package main
+
+import (
+	"testing"
+)
+
+// Simply make sure creating a new tree works.
+func TestNewTrie(t *testing.T) {
+	var trie *Trie
+	trie = newTrie()
+
+	if trie.size != 0 {
+		t.Errorf("expected size 0, got: %d", trie.size)
+	}
+}
+
+// Ensure that we can insert new keys into the tree, then check the size.
+func TestInsert(t *testing.T) {
+	var trie *Trie
+	trie = newTrie()
+
+	// We need to have an empty tree to begin with.
+	if trie.size != 0 {
+		t.Errorf("expected size 0, got: %d", trie.size)
+	}
+
+	trie.Insert("key")
+	trie.Insert("keyy")
+
+	// After inserting, we should have a size of two.
+	if trie.size != 2 {
+		t.Errorf("expected size 2, got: %d", trie.size)
+	}
+}
+
+// Ensure that PrefixMatch gives us the correct two keys in the tree.
+func TestPrefixMatch(t *testing.T) {
+	var trie *Trie
+	trie = newTrie()
+
+	// Feed it some fodder: only 'minio' and 'miny-os' should trip the matcher.
+	trie.Insert("minio")
+	trie.Insert("amazon")
+	trie.Insert("cheerio")
+	trie.Insert("miny-o's")
+
+	matches := trie.PrefixMatch("min")
+	if len(matches) != 2 {
+		t.Errorf("expected two matches, got: %d", len(matches))
+	}
+
+	if matches[0] != "minio" && matches[1] != "minio" {
+		t.Errorf("expected one match to be 'minio', got: '%s' and '%s'", matches[0], matches[1])
+	}
+}