diff --git a/pom.xml b/pom.xml
index edf73b76a..44196e876 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         <bukkitplugin.authors>Xephi, sgdc3, DNx5, timvisee, games647, ljacqu, Gnat008</bukkitplugin.authors>
 
         <!-- Change Bukkit Version HERE! -->
-        <bukkit.version>1.10.2-R0.1-SNAPSHOT</bukkit.version>
+        <bukkit.version>1.11-R0.1-SNAPSHOT</bukkit.version>
     </properties>
 
     <!-- Jenkins profile -->
diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 786203073..1adad034c 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -40,9 +40,9 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.PluginLoader;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.plugin.java.JavaPluginLoader;
 import org.bukkit.scheduler.BukkitScheduler;
 
 import java.io.File;
@@ -85,9 +85,8 @@ public class AuthMe extends JavaPlugin {
      */
     @VisibleForTesting
     @SuppressWarnings("deprecation") // the super constructor is deprecated to mark it for unit testing only
-    protected AuthMe(final PluginLoader loader, final Server server, final PluginDescriptionFile description,
-                     final File dataFolder, final File file) {
-        super(loader, server, description, dataFolder, file);
+    protected AuthMe(JavaPluginLoader loader, PluginDescriptionFile description, File dataFolder, File file) {
+        super(loader, description, dataFolder, file);
     }
 
     /**
diff --git a/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java b/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java
index a41dc588c..fd26e3da5 100644
--- a/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java
+++ b/src/test/java/fr/xephi/authme/AuthMeInitializationTest.java
@@ -19,8 +19,8 @@ import fr.xephi.authme.task.purge.PurgeService;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.plugin.PluginLoader;
 import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPluginLoader;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;
@@ -49,9 +49,6 @@ import static org.mockito.Mockito.mock;
 @RunWith(MockitoJUnitRunner.class)
 public class AuthMeInitializationTest {
 
-    @Mock
-    private PluginLoader pluginLoader;
-
     @Mock
     private Server server;
 
@@ -60,7 +57,6 @@ public class AuthMeInitializationTest {
 
     private AuthMe authMe;
     private File dataFolder;
-    private File settingsFile;
 
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
@@ -73,7 +69,8 @@ public class AuthMeInitializationTest {
     @Before
     public void initAuthMe() throws IOException {
         dataFolder = temporaryFolder.newFolder();
-        settingsFile = new File(dataFolder, "config.yml");
+        File settingsFile = new File(dataFolder, "config.yml");
+        JavaPluginLoader pluginLoader = new JavaPluginLoader(server);
         Files.copy(TestHelper.getJarFile(TestHelper.PROJECT_ROOT + "config.test.yml"), settingsFile);
 
         // Mock / wire various Bukkit components
@@ -86,7 +83,7 @@ public class AuthMeInitializationTest {
             "AuthMe", "N/A", AuthMe.class.getCanonicalName());
 
         // Initialize AuthMe
-        authMe = new AuthMe(pluginLoader, server, descriptionFile, dataFolder, null);
+        authMe = new AuthMe(pluginLoader, descriptionFile, dataFolder, null);
     }
 
     @Test