diff --git a/LogcatCoreLib/consumer-proguard-rules.pro b/LogcatCoreLib/consumer-proguard-rules.pro
new file mode 100644
index 00000000..d2706094
--- /dev/null
+++ b/LogcatCoreLib/consumer-proguard-rules.pro
@@ -0,0 +1 @@
+-keep class timber.log.Timber { *; }
diff --git a/sample/build.gradle b/sample/build.gradle
index a85c7a04..ee9ada3a 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -11,7 +11,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 30
 
         compileOptions {
@@ -19,7 +19,7 @@ android {
             targetCompatibility 1.8
         }
 
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "info.hannes.logcat.sample.CustomTestRunner"
     }
 
     buildTypes {
@@ -53,6 +53,7 @@ dependencies {
     androidTestImplementation "androidx.test.ext:junit:$extJUnitVersion"
     androidTestImplementation "androidx.test.ext:truth:1.3.0"
     androidTestImplementation "com.google.truth:truth:1.1"
+    androidTestImplementation "androidx.multidex:multidex:2.0.1"
 }
 
 def adbDirectory = '/storage/emulated/0/Download'
diff --git a/sample/src/androidTest/AndroidManifest.xml b/sample/src/androidTest/AndroidManifest.xml
index a9bab9f6..662a9ed9 100644
--- a/sample/src/androidTest/AndroidManifest.xml
+++ b/sample/src/androidTest/AndroidManifest.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="info.mx.tracks"
-          android:versionCode="1"
-          android:versionName="1.0">
+          package="info.mx.tracks">
 
     <application
         android:label="MxTest"
diff --git a/sample/src/androidTest/java/info/hannes/logcat/sample/CustomTestRunner.java b/sample/src/androidTest/java/info/hannes/logcat/sample/CustomTestRunner.java
new file mode 100644
index 00000000..8c032c79
--- /dev/null
+++ b/sample/src/androidTest/java/info/hannes/logcat/sample/CustomTestRunner.java
@@ -0,0 +1,15 @@
+package info.hannes.logcat.sample;
+
+import android.os.Bundle;
+
+import androidx.multidex.MultiDex;
+import androidx.test.runner.AndroidJUnitRunner;
+
+
+public class CustomTestRunner extends AndroidJUnitRunner {
+    @Override
+    public void onCreate(Bundle arguments) {
+        MultiDex.install(getTargetContext());
+        super.onCreate(arguments);
+    }
+}
\ No newline at end of file
diff --git a/sample/src/multidex-config.txt b/sample/src/multidex-config.txt
new file mode 100644
index 00000000..8044f0df
--- /dev/null
+++ b/sample/src/multidex-config.txt
@@ -0,0 +1 @@
+-keep class timber.log.** { *; }
\ No newline at end of file