diff --git a/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java b/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java
index 2a709b7..50e4dfe 100644
--- a/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java
+++ b/src/main/java/it/geosolutions/geoserver/rest/GeoServerRESTPublisher.java
@@ -984,7 +984,7 @@ public class GeoServerRESTPublisher {
 		return createStore(
 				workspace, DataStoreType.datastores,
 				storeName, method,
-				DataStoreExtension.shp, // TODO if GEOS-5113 is accepted, change to DataStoreExtension.shpdir 
+				DataStoreExtension.shp,
 				mime, resource, 
 				ParameterConfigure.ALL,
 				new NameValuePair[0]);
@@ -1252,7 +1252,7 @@ public class GeoServerRESTPublisher {
 	 * 
 	 */
 	public enum DataStoreExtension {
-		shp, /*shpdir,*/ properties, h2, spatialite // TODO uncomment if GEOS-5113 is accepted
+		shp, properties, h2, spatialite
 	}
 
 	/**
diff --git a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTPublishShpCollectionTest.java b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTPublishShpCollectionTest.java
index c5bd0a2..e3c5554 100644
--- a/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTPublishShpCollectionTest.java
+++ b/src/test/java/it/geosolutions/geoserver/rest/publisher/GeoserverRESTPublishShpCollectionTest.java
@@ -70,11 +70,8 @@ public class GeoserverRESTPublishShpCollectionTest extends GeoserverRESTTest {
         // Publish shp collection
         assertTrue(publisher.publishShpCollection(workspace, storeName, location));
         
-        // Test store type */
-        /* TODO uncomment if GEOS-5113 is accepted
         String storeType = reader.getDatastore(workspace, storeName).getStoreType();
-        assertEquals(storeType, "Directory of spatial files (shapefiles)");
-        */
+        assertEquals(storeType, "Shapefile");
         
         // Test published layer names
         List<String> layers = reader.getLayers().getNames();