diff --git a/liblinphone_tester/jni/Application.mk b/liblinphone_tester/jni/Application.mk
index 1e824c4cd..a6da504c7 100644
--- a/liblinphone_tester/jni/Application.mk
+++ b/liblinphone_tester/jni/Application.mk
@@ -4,4 +4,4 @@ APP_PROJECT_PATH := $(LOCAL_PATH)/../
 APP_BUILD_SCRIPT := $(LOCAL_PATH)/Android.mk
 APP_OPTIM := debug
 
-APP_MODULES += cunit liblinphone_tester liblinphone_testernoneon
+APP_MODULES += cunit liblinphone_tester 
diff --git a/liblinphone_tester/src/org/linphone/tester/Tester.java b/liblinphone_tester/src/org/linphone/tester/Tester.java
index 7a2d4656d..e115ecfd4 100644
--- a/liblinphone_tester/src/org/linphone/tester/Tester.java
+++ b/liblinphone_tester/src/org/linphone/tester/Tester.java
@@ -1,7 +1,6 @@
 package org.linphone.tester;
 
 import org.linphone.core.LinphoneCoreFactory;
-
 import org.linphone.mediastream.Version;
 
 import android.util.Log;
@@ -24,27 +23,24 @@ public class Tester {
 	}
 	
 	static	{
-		
+
 		LinphoneCoreFactory.instance();
 
 		System.loadLibrary("cunit");
-		
-		//Main library
-		if (!hasNeonInCpuFeatures()) {
-			try {
-				if (!isArmv7() && !Version.isX86()) {
-					System.loadLibrary("linphone_testerarmv5");
-				} else {
-					System.loadLibrary("linphone_testernoneon");
-				}
-			} catch (UnsatisfiedLinkError ule) {
-				Log.w("linphone", "Failed to load no-neon liblinphone_tester, loading neon liblinphone_tester");
-				System.loadLibrary("linphone_tester");
-			}
-		} else {
-			System.loadLibrary("linphone_tester");
+		String eabi = "armeabi";
+		if (Version.isX86()) {
+			eabi = "x86";
+		} else if (Version.isArmv7()) {
+			eabi = "armeabi-v7a";
 		}
-		
+		try {
+			System.loadLibrary("linphone_tester-"+eabi);
+
+		} catch (UnsatisfiedLinkError ule) {
+			Log.w("linphone", "Failed to load liblinphone_tester-"+eabi);
+			System.loadLibrary("linphone_tester"); 
+		}
+
 		Version.dumpCapabilities();
 	}
 	
diff --git a/submodules/linphone b/submodules/linphone
index 11187a8c2..5a92742e5 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 11187a8c2feec57637eb113b3ed820a35e8e6bfb
+Subproject commit 5a92742e56ade67b79400246a7f13b238960745f