diff --git a/.circleci/config.yml b/.circleci/config.yml
index fe3c122b..74156eea 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,6 +54,7 @@ jobs:
           name: Fastlane - run all tests with coverage report
           command: |
             bundle exec fastlane testDev
+            bundle exec fastlane lint
       - save_gradle_cache
       - save_bundler_cache
       - run:
diff --git a/app/src/androidTest/java/org/kabiri/android/usbterminal/MainActivityTest.kt b/app/src/androidTest/java/org/kabiri/android/usbterminal/MainActivityTest.kt
index 5a9c56a9..811120b0 100644
--- a/app/src/androidTest/java/org/kabiri/android/usbterminal/MainActivityTest.kt
+++ b/app/src/androidTest/java/org/kabiri/android/usbterminal/MainActivityTest.kt
@@ -13,7 +13,7 @@ import org.junit.runner.RunWith
 
 
 @RunWith(AndroidJUnit4::class)
-class MainActivityTest {
+internal class MainActivityTest {
 
     @get:Rule
     var rule = activityScenarioRule<MainActivity>()
diff --git a/app/src/androidTest/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepositoryAndroidTest.kt b/app/src/androidTest/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepositoryAndroidTest.kt
index de19d3ae..9057fbe1 100644
--- a/app/src/androidTest/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepositoryAndroidTest.kt
+++ b/app/src/androidTest/java/org/kabiri/android/usbterminal/data/repository/UserSettingRepositoryAndroidTest.kt
@@ -20,7 +20,7 @@ import org.kabiri.android.usbterminal.model.UserSettingPreferences
 
 private const val TEST_DATA_STORE_NAME = "test_data_store"
 @RunWith(AndroidJUnit4::class)
-class UserSettingRepositoryAndroidTest {
+internal class UserSettingRepositoryAndroidTest {
 
     private val testCoroutineDispatcher: TestDispatcher = StandardTestDispatcher()
     private val testCoroutineScope = TestScope(testCoroutineDispatcher + Job())
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 620c3601..8cf3ac62 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -33,6 +33,11 @@ platform :android do
     ])
   end
 
+  desc "Runs lint"
+  lane :lint do
+    gradle(task: "lintDebug")
+  end
+
   desc "Deploy to Firebase AppTester Dev channel"
   lane :distDev do
     gradle(tasks: [