diff --git a/core/src/main/java/org/elasticsearch/script/ScriptService.java b/core/src/main/java/org/elasticsearch/script/ScriptService.java
index 4d1cfed9544..cfc402dbb04 100644
--- a/core/src/main/java/org/elasticsearch/script/ScriptService.java
+++ b/core/src/main/java/org/elasticsearch/script/ScriptService.java
@@ -356,22 +356,6 @@ public class ScriptService extends AbstractComponent implements Closeable {
                 + scriptLang + "/" + id + "]");
     }
 
-    Tuple<String, String> getScriptNameExt(Path file) {
-        Path scriptPath = scriptsDirectory.relativize(file);
-        int extIndex = scriptPath.toString().lastIndexOf('.');
-        if (extIndex <= 0) {
-            return null;
-        }
-
-        String ext = scriptPath.toString().substring(extIndex + 1);
-        if (ext.isEmpty()) {
-            return null;
-        }
-
-        String scriptName = scriptPath.toString().substring(0, extIndex).replace(scriptPath.getFileSystem().getSeparator(), "_");
-        return new Tuple<>(scriptName, ext);
-    }
-
     private void validate(BytesReference scriptBytes, String scriptLang) {
         try {
             XContentParser parser = XContentFactory.xContent(scriptBytes).createParser(scriptBytes);
@@ -533,6 +517,22 @@ public class ScriptService extends AbstractComponent implements Closeable {
 
     private class ScriptChangesListener extends FileChangesListener {
 
+        private Tuple<String, String> getScriptNameExt(Path file) {
+            Path scriptPath = scriptsDirectory.relativize(file);
+            int extIndex = scriptPath.toString().lastIndexOf('.');
+            if (extIndex <= 0) {
+                return null;
+            }
+
+            String ext = scriptPath.toString().substring(extIndex + 1);
+            if (ext.isEmpty()) {
+                return null;
+            }
+
+            String scriptName = scriptPath.toString().substring(0, extIndex).replace(scriptPath.getFileSystem().getSeparator(), "_");
+            return new Tuple<>(scriptName, ext);
+        }
+
         @Override
         public void onFileInit(Path file) {
             Tuple<String, String> scriptNameExt = getScriptNameExt(file);
@@ -553,7 +553,7 @@ public class ScriptService extends AbstractComponent implements Closeable {
                     // with file scripts are disabled, it makes no sense to even compile it and cache it.
                     if (isAnyScriptContextEnabled(engineService.getTypes().get(0), engineService, ScriptType.FILE)) {
                         logger.info("compiling script file [{}]", file.toAbsolutePath());
-                        try(InputStreamReader reader = new InputStreamReader(Files.newInputStream(file), StandardCharsets.UTF_8)) {
+                        try (InputStreamReader reader = new InputStreamReader(Files.newInputStream(file), StandardCharsets.UTF_8)) {
                             String script = Streams.copyToString(reader);
                             CacheKey cacheKey = new CacheKey(engineService, scriptNameExt.v1(), null, Collections.emptyMap());
                             staticCache.put(cacheKey, new CompiledScript(ScriptType.FILE, scriptNameExt.v1(), engineService.getTypes().get(0), engineService.compile(script, Collections.emptyMap())));
diff --git a/core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java b/core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java
index 60363b57b3b..a369b44e2b1 100644
--- a/core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java
+++ b/core/src/test/java/org/elasticsearch/script/ScriptServiceTests.java
@@ -19,7 +19,6 @@
 package org.elasticsearch.script;
 
 import org.elasticsearch.common.Nullable;
-import org.elasticsearch.common.collect.Tuple;
 import org.elasticsearch.common.io.Streams;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
@@ -147,52 +146,22 @@ public class ScriptServiceTests extends ESTestCase {
         }
     }
 
-    public void testInvalidScriptNames() throws IOException {
-        buildScriptService(Settings.EMPTY);
-
-        Path testHiddenFile = scriptsFilePath.resolve(".hidden_file");
-        assertThat(scriptService.getScriptNameExt(testHiddenFile), org.hamcrest.Matchers.nullValue());
-
-        Path testWithoutName = scriptsFilePath.resolve("");
-        assertThat(scriptService.getScriptNameExt(testWithoutName), org.hamcrest.Matchers.nullValue());
-
-        Path testDotName = scriptsFilePath.resolve(".");
-        assertThat(scriptService.getScriptNameExt(testDotName), org.hamcrest.Matchers.nullValue());
-
-        Path testWithoutExtension = scriptsFilePath.resolve("test.");
-        assertThat(scriptService.getScriptNameExt(testWithoutExtension), org.hamcrest.Matchers.nullValue());
-
-        Path testNameOnly = scriptsFilePath.resolve("test");
-        assertThat(scriptService.getScriptNameExt(testNameOnly), org.hamcrest.Matchers.nullValue());
-    }
-
-    public void testValidScriptName() throws IOException {
-        buildScriptService(Settings.EMPTY);
-
-        Path testTestFile = scriptsFilePath.resolve("test.ext");
-        Tuple<String, String> scriptNameExt = scriptService.getScriptNameExt(testTestFile);
-        assertThat(scriptNameExt.v1(), org.hamcrest.Matchers.equalTo("test"));
-        assertThat(scriptNameExt.v2(), org.hamcrest.Matchers.equalTo("ext"));
-    }
-
-    public void testScriptChangesListenerOnceHiddenFileDetected() throws IOException {
+    public void testScriptCompiledOnceHiddenFileDetected() throws IOException {
         buildScriptService(Settings.EMPTY);
 
         Path testHiddenFile = scriptsFilePath.resolve(".hidden_file");
         Streams.copy("test_hidden_file".getBytes("UTF-8"), Files.newOutputStream(testHiddenFile));
+
+        Path testFileScript = scriptsFilePath.resolve("file_script.tst");
+        Streams.copy("test_file_script".getBytes("UTF-8"), Files.newOutputStream(testFileScript));
         resourceWatcherService.notifyNow();
 
-        try {
-            String invalidScriptName = "";
-            scriptService.compile(new Script(invalidScriptName, ScriptType.FILE, "test", null),
-                    ScriptContext.Standard.SEARCH, Collections.emptyMap());
-            fail("the script .hidden_file should not be processed");
-        } catch (IllegalArgumentException ex) {
-            //script without name because it is a hidden file
-            assertThat(ex.getMessage(), containsString("Unable to find on disk file script [] using lang [test]"));
-        }
+        CompiledScript compiledScript = scriptService.compile(new Script("file_script", ScriptType.FILE, "test", null),
+                ScriptContext.Standard.SEARCH, Collections.emptyMap());
+        assertThat(compiledScript.compiled(), equalTo((Object) "compiled_test_file_script"));
 
         Files.delete(testHiddenFile);
+        Files.delete(testFileScript);
         resourceWatcherService.notifyNow();
     }