diff --git a/src/main/java/net/dv8tion/jda/api/entities/Guild.java b/src/main/java/net/dv8tion/jda/api/entities/Guild.java
index 0d97ca44ec..39694d8674 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/Guild.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/Guild.java
@@ -1319,7 +1319,7 @@ default String getOwnerId()
      * @return The Member object of the currently logged in account.
      */
     @Nonnull
-    Member getSelfMember();
+    SelfMember getSelfMember();
 
     /**
      * Returns the NSFW Level that this guild is classified with.
@@ -3916,13 +3916,16 @@ default RestAction<Void> kickVoiceMember(@Nonnull UserSnowflake user)
      * @param  member
      *         The {@link Member Member} for which the nickname should be changed.
      * @param  nickname
-     *         The new nickname of the {@link Member Member}, provide {@code null} or an
-     *         empty String to reset the nickname
+     *         The new nickname of the {@link Member Member}, max {@value Member#MAX_NICKNAME_LENGTH} characters in length,
+     *         provide {@code null} or an empty String to reset the nickname
      *
      * @throws IllegalArgumentException
-     *         If the specified {@link Member Member}
-     *         is not from the same {@link net.dv8tion.jda.api.entities.Guild Guild}.
-     *         Or if the provided member is {@code null}
+     *         <ul>
+     *             <li>If the specified {@link Member} is {@code null}</li>
+     *             <li>If the specified {@link Member} is not from the same {@link Guild}</li>
+     *             <li>If the new nickname is more than {@value Member#MAX_NICKNAME_LENGTH} characters in length</li>
+     *         </ul>
+     *
      * @throws net.dv8tion.jda.api.exceptions.InsufficientPermissionException
      *         <ul>
      *             <li>If attempting to set nickname for self and the logged in account has neither {@link net.dv8tion.jda.api.Permission#NICKNAME_CHANGE}
diff --git a/src/main/java/net/dv8tion/jda/api/entities/Member.java b/src/main/java/net/dv8tion/jda/api/entities/Member.java
index 25398c4c0f..7bd33a6ab6 100644
--- a/src/main/java/net/dv8tion/jda/api/entities/Member.java
+++ b/src/main/java/net/dv8tion/jda/api/entities/Member.java
@@ -70,6 +70,8 @@ public interface Member extends IMentionable, IPermissionHolder, IDetachableEnti
     String AVATAR_URL = "https://cdn.discordapp.com/guilds/%s/users/%s/avatars/%s.%s";
     /** Maximum number of days a Member can be timed out for */
     int MAX_TIME_OUT_LENGTH = 28;
+    /** Max length of a member nickname */
+    int MAX_NICKNAME_LENGTH = 32;
 
     /**
      * The user wrapped by this Entity.
diff --git a/src/main/java/net/dv8tion/jda/api/entities/SelfMember.java b/src/main/java/net/dv8tion/jda/api/entities/SelfMember.java
new file mode 100644
index 0000000000..0ad16d06e4
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/entities/SelfMember.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.entities;
+
+import net.dv8tion.jda.api.managers.SelfMemberManager;
+import net.dv8tion.jda.api.requests.RestAction;
+
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nonnull;
+
+/**
+ * Represents a Guild-specific {@link SelfUser}.
+ *
+ * @see Member
+ */
+public interface SelfMember extends Member
+{
+    /** Max length of a member bio */
+    int MAX_BIO_LENGTH = 190;
+
+    @Nonnull
+    @Override
+    SelfUser getUser();
+
+    /**
+     * Returns the {@link SelfMemberManager} for this SelfMember,
+     * used to modify some properties of the currently logged in guild member.
+     *
+     * <p>If you wish to modify multiple fields,
+     * do it in one request by chaining setters before calling {@link RestAction#queue()}.
+     *
+     * @return The manager of this SelfMember
+     */
+    @Nonnull
+    @CheckReturnValue
+    SelfMemberManager getManager();
+}
diff --git a/src/main/java/net/dv8tion/jda/api/managers/AccountManager.java b/src/main/java/net/dv8tion/jda/api/managers/AccountManager.java
index f34f792c76..8a12d00004 100644
--- a/src/main/java/net/dv8tion/jda/api/managers/AccountManager.java
+++ b/src/main/java/net/dv8tion/jda/api/managers/AccountManager.java
@@ -67,6 +67,7 @@ public interface AccountManager extends Manager<AccountManager>
      * <ul>
      *     <li>{@link #NAME}</li>
      *     <li>{@link #AVATAR}</li>
+     *     <li>{@link #BANNER}</li>
      * </ul>
      *
      * @param  fields
@@ -87,6 +88,7 @@ public interface AccountManager extends Manager<AccountManager>
      * <ul>
      *     <li>{@link #NAME}</li>
      *     <li>{@link #AVATAR}</li>
+     *     <li>{@link #BANNER}</li>
      * </ul>
      *
      * @param  fields
diff --git a/src/main/java/net/dv8tion/jda/api/managers/SelfMemberManager.java b/src/main/java/net/dv8tion/jda/api/managers/SelfMemberManager.java
new file mode 100644
index 0000000000..5adebbf26a
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/api/managers/SelfMemberManager.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.api.managers;
+
+import net.dv8tion.jda.api.entities.*;
+
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * Manager providing functionality to update one or more fields for the logged in account.
+ *
+ * @see Guild#getSelfMember()
+ * @see SelfUser#getManager()
+ */
+public interface SelfMemberManager extends Manager<SelfMemberManager>
+{
+    /** Used to reset the name field */
+    long NICKNAME = 1;
+    /** Used to reset the avatar field */
+    long AVATAR   = 1 << 1;
+    /** Used to reset the banner field */
+    long BANNER   = 1 << 2;
+    /** Used to reset the bio field */
+    long BIO      = 1 << 3;
+
+    /**
+     * The {@link SelfMember} that will be modified by this SelfMemberManager.
+     *
+     * @return The corresponding member
+     */
+    @Nonnull
+    SelfMember getMember();
+
+    /**
+     * Resets the fields specified by the provided bit-flag pattern.
+     * You can specify a combination by using a bitwise OR concat of the flag constants.
+     * <br>Example: {@code manager.reset(SelfMemberManager.NAME | SelfMemberManager.AVATAR);}
+     *
+     * <p><b>Flag Constants:</b>
+     * <ul>
+     *     <li>{@link #NICKNAME}</li>
+     *     <li>{@link #AVATAR}</li>
+     *     <li>{@link #BANNER}</li>
+     *     <li>{@link #BIO}</li>
+     * </ul>
+     *
+     * @param  fields
+     *         Integer value containing the flags to reset.
+     *
+     * @return SelfMemberManager for chaining convenience
+     */
+    @Nonnull
+    @Override
+    @CheckReturnValue
+    SelfMemberManager reset(long fields);
+
+    /**
+     * Resets the fields specified by the provided bit-flag patterns.
+     * <br>Example: {@code manager.reset(SelfMemberManager.NAME, SelfMemberManager.AVATAR);}
+     *
+     * <p><b>Flag Constants:</b>
+     * <ul>
+     *     <li>{@link #NICKNAME}</li>
+     *     <li>{@link #AVATAR}</li>
+     *     <li>{@link #BANNER}</li>
+     *     <li>{@link #BIO}</li>
+     * </ul>
+     *
+     * @param  fields
+     *         Integer values containing the flags to reset.
+     *
+     * @return SelfMemberManager for chaining convenience
+     */
+    @Nonnull
+    @Override
+    @CheckReturnValue
+    SelfMemberManager reset(@Nonnull long... fields);
+
+    /**
+     * Sets the nickname for the guild member of the currently logged in account.
+     *
+     * <p>The nickname is a name specific to the guild, when not set, your user's name will display.
+     *
+     * @param  nickname
+     *         The new nickname, max {@value Member#MAX_NICKNAME_LENGTH} characters in length,
+     *         {@code null} to remove the nickname
+     *
+     * @throws IllegalArgumentException
+     *         <ul>
+     *             <li>
+     *                 If the provided nickname is non-null
+     *                 and is blank or more than {@value Member#MAX_NICKNAME_LENGTH} characters in length
+     *             </li>
+     *             <li>
+     *                 If the guild member of the current logged in account does not have
+     *                 the {@link net.dv8tion.jda.api.Permission#NICKNAME_CHANGE NICKNAME_CHANGE} permission
+     *             </li>
+     *         </ul>
+     *
+     *
+     * @return SelfMemberManager for chaining convenience
+     */
+    @Nonnull
+    @CheckReturnValue
+    SelfMemberManager setNickname(@Nullable String nickname);
+
+    /**
+     * Sets the avatar for the guild member of the currently logged in account.
+     *
+     * @param  avatar
+     *         An {@link Icon} instance representing the new Avatar,
+     *         {@code null} to reset the avatar to the user avatar.
+     *
+     * @return SelfMemberManager for chaining convenience
+     */
+    @Nonnull
+    @CheckReturnValue
+    SelfMemberManager setAvatar(@Nullable Icon avatar);
+
+    /**
+     * Sets the banner for the guild member of the currently logged in account.
+     *
+     * @param  banner
+     *         An {@link Icon} instance representing the new banner,
+     *         {@code null} to reset the banner to the user banner.
+     *
+     * @return SelfMemberManager for chaining convenience
+     */
+    @Nonnull
+    @CheckReturnValue
+    SelfMemberManager setBanner(@Nullable Icon banner);
+
+    /**
+     * Sets the bio for the guild member of the currently logged in account.
+     *
+     * @param  bio
+     *         The new bio,
+     *         {@code null} to remove the bio
+     *
+     * @throws IllegalArgumentException
+     *         If the provided bio is non-null
+     *         and is blank or more than {@value SelfMember#MAX_BIO_LENGTH} characters in length
+     *
+     * @return SelfMemberManager for chaining convenience
+     */
+    @Nonnull
+    @CheckReturnValue
+    SelfMemberManager setBio(@Nullable String bio);
+}
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java b/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java
index 03b9080e89..116aaa59fe 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/EntityBuilder.java
@@ -653,7 +653,10 @@ public MemberImpl createMember(GuildImpl guild, DataObject memberJson, DataObjec
         if (member == null)
         {
             // Create a brand new member
-            member = new MemberImpl(guild, user);
+            if (user.getIdLong() == getJDA().getSelfUser().getIdLong())
+                member = new SelfMemberImpl(guild, ((SelfUser) user));
+            else
+                member = new MemberImpl(guild, user);
             configureMember(memberJson, member);
             Set<Role> roles = member.getRoleSet();
             for (int i = 0; i < roleArray.length(); i++)
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java
index 4f2bcaf066..0dcc908013 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java
@@ -743,12 +743,12 @@ public boolean isMember(@Nonnull UserSnowflake user)
 
     @Nonnull
     @Override
-    public Member getSelfMember()
+    public SelfMember getSelfMember()
     {
         Member member = getMember(getJDA().getSelfUser());
         if (member == null)
             throw new IllegalStateException("Guild does not have a self member");
-        return member;
+        return (SelfMember) member;
     }
 
     @Override
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/SelfMemberImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/SelfMemberImpl.java
new file mode 100644
index 0000000000..311e2a51cf
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/internal/entities/SelfMemberImpl.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.internal.entities;
+
+import net.dv8tion.jda.api.entities.SelfMember;
+import net.dv8tion.jda.api.entities.SelfUser;
+import net.dv8tion.jda.api.managers.SelfMemberManager;
+import net.dv8tion.jda.internal.managers.SelfMemberManagerImpl;
+
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nonnull;
+
+public class SelfMemberImpl extends MemberImpl implements SelfMember
+{
+    public SelfMemberImpl(GuildImpl guild, SelfUser user)
+    {
+        super(guild, user);
+    }
+
+    @Nonnull
+    @Override
+    public SelfUser getUser()
+    {
+        return (SelfUser) super.getUser();
+    }
+
+    @Nonnull
+    @Override
+    @CheckReturnValue
+    public SelfMemberManager getManager()
+    {
+        return new SelfMemberManagerImpl(this);
+    }
+
+    // Inherit equals/hashCode/toString
+}
diff --git a/src/main/java/net/dv8tion/jda/internal/entities/detached/DetachedGuildImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/detached/DetachedGuildImpl.java
index 5e22720951..29c1daa7fe 100644
--- a/src/main/java/net/dv8tion/jda/internal/entities/detached/DetachedGuildImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/entities/detached/DetachedGuildImpl.java
@@ -423,7 +423,7 @@ public boolean isMember(@Nonnull UserSnowflake user)
 
     @Nonnull
     @Override
-    public Member getSelfMember()
+    public SelfMember getSelfMember()
     {
         throw detachedException();
     }
diff --git a/src/main/java/net/dv8tion/jda/internal/managers/SelfMemberManagerImpl.java b/src/main/java/net/dv8tion/jda/internal/managers/SelfMemberManagerImpl.java
new file mode 100644
index 0000000000..3dccdecd2c
--- /dev/null
+++ b/src/main/java/net/dv8tion/jda/internal/managers/SelfMemberManagerImpl.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2015 Austin Keener, Michael Ritter, Florian Spieß, and the JDA contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dv8tion.jda.internal.managers;
+
+import net.dv8tion.jda.api.entities.Icon;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.SelfMember;
+import net.dv8tion.jda.api.managers.SelfMemberManager;
+import net.dv8tion.jda.api.requests.Request;
+import net.dv8tion.jda.api.requests.Response;
+import net.dv8tion.jda.api.requests.Route;
+import net.dv8tion.jda.api.utils.data.DataObject;
+import net.dv8tion.jda.internal.utils.Checks;
+import okhttp3.RequestBody;
+
+import javax.annotation.CheckReturnValue;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class SelfMemberManagerImpl extends ManagerBase<SelfMemberManager> implements SelfMemberManager
+{
+    protected final SelfMember selfMember;
+
+    protected String nickname;
+    protected Icon avatar;
+    protected Icon banner;
+    protected String bio;
+
+    public SelfMemberManagerImpl(@Nonnull SelfMember selfMember)
+    {
+        super(selfMember.getJDA(), Route.Guilds.MODIFY_SELF.compile(selfMember.getGuild().getId()));
+        this.selfMember = selfMember;
+    }
+
+    @Nonnull
+    @Override
+    public SelfMember getMember()
+    {
+        return selfMember;
+    }
+
+    @Nonnull
+    @Override
+    @CheckReturnValue
+    public SelfMemberManagerImpl reset(long fields)
+    {
+        super.reset(fields);
+        if ((fields & NICKNAME) == NICKNAME)
+            nickname = null;
+        if ((fields & AVATAR) == AVATAR)
+            avatar = null;
+        if ((fields & BANNER) == BANNER)
+            banner = null;
+        if ((fields & BIO) == BIO)
+            bio = null;
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    @CheckReturnValue
+    public SelfMemberManagerImpl reset(@Nonnull long... fields)
+    {
+        super.reset(fields);
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    @CheckReturnValue
+    public SelfMemberManagerImpl reset()
+    {
+        super.reset();
+        nickname = null;
+        avatar = null;
+        banner = null;
+        bio = null;
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    @CheckReturnValue
+    public SelfMemberManagerImpl setNickname(@Nullable String nickname)
+    {
+        if (nickname != null)
+            Checks.notLonger(nickname, Member.MAX_NICKNAME_LENGTH, "Nickname");
+        this.nickname = nickname;
+        set |= NICKNAME;
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    @CheckReturnValue
+    public SelfMemberManagerImpl setAvatar(@Nullable Icon avatar)
+    {
+        this.avatar = avatar;
+        set |= AVATAR;
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    @CheckReturnValue
+    public SelfMemberManagerImpl setBanner(@Nullable Icon banner)
+    {
+        this.banner = banner;
+        set |= BANNER;
+        return this;
+    }
+
+    @Nonnull
+    @Override
+    @CheckReturnValue
+    public SelfMemberManagerImpl setBio(@Nullable String bio)
+    {
+        if (bio != null)
+            Checks.notLonger(bio, SelfMember.MAX_BIO_LENGTH, "Bio");
+        this.bio = bio;
+        set |= BIO;
+        return this;
+    }
+
+    @Override
+    protected RequestBody finalizeData()
+    {
+        DataObject body = DataObject.empty();
+
+        if (shouldUpdate(NICKNAME))
+            body.put("nick", nickname);
+        if (shouldUpdate(AVATAR))
+            body.put("avatar", avatar == null ? null : avatar.getEncoding());
+        if (shouldUpdate(BANNER))
+            body.put("banner", banner == null ? null : banner.getEncoding());
+        if (shouldUpdate(BIO))
+            body.put("bio", bio);
+
+        reset();
+        return getRequestBody(body);
+    }
+
+    @Override
+    protected void handleSuccess(Response response, Request<Void> request)
+    {
+        request.onSuccess(null);
+    }
+}
diff --git a/src/test/java/net/dv8tion/jda/test/entities/guild/AbstractGuildTest.java b/src/test/java/net/dv8tion/jda/test/entities/guild/AbstractGuildTest.java
index 0dd7263ff3..54ff975509 100644
--- a/src/test/java/net/dv8tion/jda/test/entities/guild/AbstractGuildTest.java
+++ b/src/test/java/net/dv8tion/jda/test/entities/guild/AbstractGuildTest.java
@@ -19,7 +19,7 @@
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
 import net.dv8tion.jda.internal.entities.GuildImpl;
-import net.dv8tion.jda.internal.entities.MemberImpl;
+import net.dv8tion.jda.internal.entities.SelfMemberImpl;
 import net.dv8tion.jda.internal.entities.SelfUserImpl;
 import net.dv8tion.jda.internal.utils.UnlockHook;
 import net.dv8tion.jda.internal.utils.cache.MemberCacheViewImpl;
@@ -38,7 +38,7 @@ public abstract class AbstractGuildTest extends IntegrationTest
     @Mock
     protected SelfUserImpl selfUser;
     @Mock
-    protected MemberImpl selfMember;
+    protected SelfMemberImpl selfMember;
 
     protected GuildImpl guild;
 
diff --git a/src/test/java/net/dv8tion/jda/test/entities/guild/GuildLevelCacheTest.java b/src/test/java/net/dv8tion/jda/test/entities/guild/GuildLevelCacheTest.java
index 477edf1462..018fff206d 100644
--- a/src/test/java/net/dv8tion/jda/test/entities/guild/GuildLevelCacheTest.java
+++ b/src/test/java/net/dv8tion/jda/test/entities/guild/GuildLevelCacheTest.java
@@ -59,7 +59,7 @@ private GuildImpl getGuild()
         MemberCacheViewImpl membersView = guild.getMembersView();
         try (UnlockHook hook = membersView.writeLock())
         {
-            membersView.getMap().put(Constants.BUTLER_USER_ID, new MemberImpl(guild, selfUser));
+            membersView.getMap().put(Constants.BUTLER_USER_ID, new SelfMemberImpl(guild, selfUser));
         }
 
         return guild;
@@ -108,7 +108,7 @@ void shouldReturnNullForOtherMembers()
         void shouldReturnNonNullForSelfUser()
         {
             GuildImpl guild = getGuild();
-            MemberImpl member = new MemberImpl(guild, selfUser);
+            MemberImpl member = new SelfMemberImpl(guild, selfUser);
 
             assertThat(member.getVoiceState()).isNotNull();
         }
@@ -162,7 +162,7 @@ void shouldReturnNonNullForOtherMembers()
         void shouldReturnNonNullForSelfUser()
         {
             GuildImpl guild = getGuild();
-            MemberImpl member = new MemberImpl(guild, selfUser);
+            MemberImpl member = new SelfMemberImpl(guild, selfUser);
 
             assertThat(member.getVoiceState()).isNotNull();
         }
diff --git a/src/test/java/net/dv8tion/jda/test/managers/GuildManagerTest.java b/src/test/java/net/dv8tion/jda/test/managers/GuildManagerTest.java
index 818a720fb4..cbd347adff 100644
--- a/src/test/java/net/dv8tion/jda/test/managers/GuildManagerTest.java
+++ b/src/test/java/net/dv8tion/jda/test/managers/GuildManagerTest.java
@@ -18,7 +18,7 @@
 
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.SelfMember;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel;
 import net.dv8tion.jda.api.managers.GuildManager;
@@ -48,7 +48,7 @@ public class GuildManagerTest extends IntegrationTest
     @Mock
     private Guild guild;
     @Mock
-    private Member selfMember;
+    private SelfMember selfMember;
     @Mock
     private TextChannel textChannel;
     @Mock
diff --git a/src/test/java/net/dv8tion/jda/test/restaction/ThreadCreateActionTest.java b/src/test/java/net/dv8tion/jda/test/restaction/ThreadCreateActionTest.java
index 738dc4a091..3914931a02 100644
--- a/src/test/java/net/dv8tion/jda/test/restaction/ThreadCreateActionTest.java
+++ b/src/test/java/net/dv8tion/jda/test/restaction/ThreadCreateActionTest.java
@@ -18,7 +18,7 @@
 
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.SelfMember;
 import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.entities.channel.attribute.IPostContainer;
 import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
@@ -46,7 +46,7 @@ public class ThreadCreateActionTest extends IntegrationTest
     @Mock
     private TextChannel textChannel;
     @Mock
-    private Member selfMember;
+    private SelfMember selfMember;
 
     @BeforeEach
     void setupMocks()