diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
index 2f28c9e79..69d78326e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/convert/MappingMongoConverter.java
@@ -434,7 +434,7 @@ public class MappingMongoConverter implements MongoConverter, ApplicationContext
         if (null != dbref) {
           DBRef dbRef = createDBRef(propObjItem, dbref);
           dbList.add(dbRef);
-        } else if (MappingBeanHelper.isSimpleType(type.getComponentType())) {
+        } else if (type.isArray() && MappingBeanHelper.isSimpleType(type.getComponentType())) {
           dbList.add(propObjItem);
         } else {
           BasicDBObject propDbObj = new BasicDBObject();
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingConverterTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingConverterTests.java
deleted file mode 100644
index 15d83bfd4..000000000
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/mapping/MappingConverterTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2011 by the original author(s).
- *
- * 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 org.springframework.data.document.mongodb.mapping;
-
-/**
- * @author Jon Brisbin <jbrisbin@vmware.com>
- */
-public class MappingConverterTests {
-}