diff --git a/cmd/certs_test.go b/cmd/certs_test.go
index 39c6188e8..a68f8176e 100644
--- a/cmd/certs_test.go
+++ b/cmd/certs_test.go
@@ -106,6 +106,6 @@ func TestParseInvalidCertificateChain(t *testing.T) {
 
 	// then
 	if err == nil {
-		t.Fatalf("Expected error but none occured")
+		t.Fatalf("Expected error but none occurred")
 	}
 }
diff --git a/cmd/event-notifier.go b/cmd/event-notifier.go
index ed86acd8a..f5594ab50 100644
--- a/cmd/event-notifier.go
+++ b/cmd/event-notifier.go
@@ -369,7 +369,7 @@ func loadListenerConfig(bucket string, objAPI ObjectLayer) ([]listenerConfig, er
 	if err != nil {
 		// 'notification.xml' not found return
 		// 'errNoSuchNotifications'.  This is default when no
-		// bucket listners are found on the bucket.
+		// bucket listeners are found on the bucket.
 		switch err.(type) {
 		case ObjectNotFound:
 			return nil, errNoSuchNotifications
diff --git a/cmd/fs-v1.go b/cmd/fs-v1.go
index b43abceda..bdfefc080 100644
--- a/cmd/fs-v1.go
+++ b/cmd/fs-v1.go
@@ -440,7 +440,7 @@ func (fs fsObjects) PutObject(bucket string, object string, size int64, data io.
 	// get a random ID for lock instrumentation.
 	opsID := getOpsID()
 
-	// Lock the object before comitting the object.
+	// Lock the object before committing the object.
 	nsMutex.RLock(bucket, object, opsID)
 	defer nsMutex.RUnlock(bucket, object, opsID)
 
diff --git a/cmd/object-handlers_test.go b/cmd/object-handlers_test.go
index 8b45a43a1..e6271bb48 100644
--- a/cmd/object-handlers_test.go
+++ b/cmd/object-handlers_test.go
@@ -1349,7 +1349,7 @@ func testAPICompleteMultipartHandler(obj ObjectLayer, instanceType, bucketName s
 		},
 	}
 
-	// on successfull complete multipart operation the s3MD5 for the parts uploaded will be returned.
+	// on successful complete multipart operation the s3MD5 for the parts uploaded will be returned.
 	s3MD5, err := getCompleteMultipartMD5(inputParts[3].parts...)
 	if err != nil {
 		t.Fatalf("Obtaining S3MD5 failed")
@@ -2141,7 +2141,7 @@ func testAPIPutObjectPartHandler(obj ObjectLayer, instanceType, bucketName strin
 						t.Fatalf("%s, Failed to unmarshal error response from upload part request \"%s\"/\"%s\": <ERROR> %v.",
 							reqType, bucketName, test.objectName, err)
 					}
-					// Validate whether the error has occured for the expected reason.
+					// Validate whether the error has occurred for the expected reason.
 					if test.expectedAPIError.Code != errXML.Code {
 						t.Errorf("%s, Expected to fail with error \"%s\", but received \"%s\".",
 							reqType, test.expectedAPIError.Code, errXML.Code)
@@ -2421,7 +2421,7 @@ func testAPIListObjectPartsHandler(obj ObjectLayer, instanceType, bucketName str
 						t.Fatalf("%s, Failed to unmarshal error response from list object partsest %s/%s: <ERROR> %v",
 							reqType, bucketName, testObject, err)
 					}
-					// Validate whether the error has occured for the expected reason.
+					// Validate whether the error has occurred for the expected reason.
 					if test.expectedErr.Code != errXML.Code {
 						t.Errorf("%s, Expected to fail with %s but received %s",
 							reqType, test.expectedErr.Code, errXML.Code)