diff --git a/src/main/java/io/ebean/Ebean.java b/src/main/java/io/ebean/Ebean.java
index 099ff6a95..50300010c 100644
--- a/src/main/java/io/ebean/Ebean.java
+++ b/src/main/java/io/ebean/Ebean.java
@@ -4,10 +4,10 @@ import io.ebean.annotation.TxIsolation;
 import io.ebean.cache.ServerCacheManager;
 import io.ebean.config.BeanNotEnhancedException;
 import io.ebean.config.ServerConfig;
+import io.ebean.datasource.DataSourceConfigurationException;
 import io.ebean.plugin.Property;
 import io.ebean.text.csv.CsvReader;
 import io.ebean.text.json.JsonContext;
-import io.ebean.datasource.DataSourceConfigurationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -167,7 +167,7 @@ public final class Ebean {
 
       } catch (DataSourceConfigurationException e) {
         String msg = "Configuration error creating DataSource for the default EbeanServer." +
-          " This typically means a missing application-test.yml or missing ebean-test-config dependency." +
+          " This typically means a missing application-test.yaml or missing ebean-test-config dependency." +
           " See https://ebean.io/docs/trouble-shooting#datasource";
         throw new DataSourceConfigurationException(msg, e);
 
diff --git a/src/main/java/io/ebean/config/properties/Loader.java b/src/main/java/io/ebean/config/properties/Loader.java
index 4c0d07443..544514d68 100644
--- a/src/main/java/io/ebean/config/properties/Loader.java
+++ b/src/main/java/io/ebean/config/properties/Loader.java
@@ -63,6 +63,7 @@ class Loader {
    */
   private void loadTest() {
     loadProperties("application-test.properties", Source.RESOURCE);
+    loadYaml("application-test.yaml", Source.RESOURCE);
     loadYaml("application-test.yml", Source.RESOURCE);
     loadProperties("test-ebean.properties", Source.RESOURCE);
   }
@@ -83,6 +84,7 @@ class Loader {
    * Load the main configuration for the given source.
    */
   private void loadMain(Source source) {
+    loadYaml("application.yaml", source);
     loadYaml("application.yml", source);
     loadProperties("application.properties", source);
     loadProperties("ebean.properties", source);
diff --git a/src/main/java/io/ebean/config/properties/PropertiesLoader.java b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
index 3df479919..a9eb27faa 100644
--- a/src/main/java/io/ebean/config/properties/PropertiesLoader.java
+++ b/src/main/java/io/ebean/config/properties/PropertiesLoader.java
@@ -18,14 +18,14 @@ public class PropertiesLoader {
    * <p>Firstly loads from main resources</p>
    * <pre>
    *   - application.properties
-   *   - application.yml
+   *   - application.yaml
    *   - ebean.properties
    * </pre>
    * <p>
    * <p>Then loads from local files</p>
    * <pre>
    *   - application.properties
-   *   - application.yml
+   *   - application.yaml
    *   - ebean.properties
    * </pre>
    * <p>
@@ -41,7 +41,7 @@ public class PropertiesLoader {
    * <p>Loads from test resources</p>
    * <pre>
    *   - application-test.properties
-   *   - application-test.yml
+   *   - application-test.yaml
    *   - test-ebean.properties
    * </pre>
    */
diff --git a/src/test/java/io/ebean/config/properties/LoaderTest.java b/src/test/java/io/ebean/config/properties/LoaderTest.java
index 7a4edea8d..7f89d5848 100644
--- a/src/test/java/io/ebean/config/properties/LoaderTest.java
+++ b/src/test/java/io/ebean/config/properties/LoaderTest.java
@@ -17,7 +17,7 @@ public class LoaderTest {
 
     Loader loader = new Loader();
     loader.loadProperties("test-properties/application.properties", Loader.Source.RESOURCE);
-    loader.loadYaml("test-properties/application.yml", Loader.Source.RESOURCE);
+    loader.loadYaml("test-properties/application.yaml", Loader.Source.RESOURCE);
 
     loader.loadProperties("test-properties/one.properties", Loader.Source.RESOURCE);
     loader.loadYaml("test-properties/foo.yml", Loader.Source.RESOURCE);
diff --git a/src/test/resources/test-properties/application.yml b/src/test/resources/test-properties/application.yaml
similarity index 100%
rename from src/test/resources/test-properties/application.yml
rename to src/test/resources/test-properties/application.yaml