diff --git a/services/filestore/test/unit/coffee/AWSSDKPersistorManagerTests.js b/services/filestore/test/unit/js/AWSSDKPersistorManagerTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/AWSSDKPersistorManagerTests.js
rename to services/filestore/test/unit/js/AWSSDKPersistorManagerTests.js
diff --git a/services/filestore/test/unit/coffee/BucketControllerTests.js b/services/filestore/test/unit/js/BucketControllerTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/BucketControllerTests.js
rename to services/filestore/test/unit/js/BucketControllerTests.js
diff --git a/services/filestore/test/unit/coffee/FSPersistorManagerTests.js b/services/filestore/test/unit/js/FSPersistorManagerTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/FSPersistorManagerTests.js
rename to services/filestore/test/unit/js/FSPersistorManagerTests.js
diff --git a/services/filestore/test/unit/coffee/FileControllerTests.js b/services/filestore/test/unit/js/FileControllerTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/FileControllerTests.js
rename to services/filestore/test/unit/js/FileControllerTests.js
diff --git a/services/filestore/test/unit/coffee/FileConverterTests.js b/services/filestore/test/unit/js/FileConverterTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/FileConverterTests.js
rename to services/filestore/test/unit/js/FileConverterTests.js
diff --git a/services/filestore/test/unit/coffee/FileHandlerTests.js b/services/filestore/test/unit/js/FileHandlerTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/FileHandlerTests.js
rename to services/filestore/test/unit/js/FileHandlerTests.js
diff --git a/services/filestore/test/unit/coffee/ImageOptimiserTests.js b/services/filestore/test/unit/js/ImageOptimiserTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/ImageOptimiserTests.js
rename to services/filestore/test/unit/js/ImageOptimiserTests.js
diff --git a/services/filestore/test/unit/coffee/KeybuilderTests.js b/services/filestore/test/unit/js/KeybuilderTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/KeybuilderTests.js
rename to services/filestore/test/unit/js/KeybuilderTests.js
diff --git a/services/filestore/test/unit/coffee/LocalFileWriterTests.js b/services/filestore/test/unit/js/LocalFileWriterTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/LocalFileWriterTests.js
rename to services/filestore/test/unit/js/LocalFileWriterTests.js
diff --git a/services/filestore/test/unit/coffee/PersistorManagerTests.js b/services/filestore/test/unit/js/PersistorManagerTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/PersistorManagerTests.js
rename to services/filestore/test/unit/js/PersistorManagerTests.js
diff --git a/services/filestore/test/unit/coffee/S3PersistorManagerTests.js b/services/filestore/test/unit/js/S3PersistorManagerTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/S3PersistorManagerTests.js
rename to services/filestore/test/unit/js/S3PersistorManagerTests.js
diff --git a/services/filestore/test/unit/coffee/SafeExecTests.js b/services/filestore/test/unit/js/SafeExecTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/SafeExecTests.js
rename to services/filestore/test/unit/js/SafeExecTests.js
diff --git a/services/filestore/test/unit/coffee/SettingsTests.js b/services/filestore/test/unit/js/SettingsTests.js
similarity index 100%
rename from services/filestore/test/unit/coffee/SettingsTests.js
rename to services/filestore/test/unit/js/SettingsTests.js