diff --git a/Makefile b/Makefile
index 8a39e654d..15ad4c67e 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ DIRECT_TESTS += \
   java_crashcontext java_harness
 endif
 ifneq ($(XCODE_SELECT),no)
-DIRECT_TESTS += objc_frontend objc_errors objc_linters objc_ioslinters objcpp_frontend objcpp_linters
+DIRECT_TESTS += objc_frontend objc_errors objc_linters objc_ioslints objcpp_frontend objcpp_linters
 endif
 
 .PHONY: all
diff --git a/infer/tests/codetoanalyze/objc/ioslinters/issues.exp b/infer/tests/codetoanalyze/objc/ioslinters/issues.exp
deleted file mode 100644
index eccb76c2a..000000000
--- a/infer/tests/codetoanalyze/objc/ioslinters/issues.exp
+++ /dev/null
@@ -1,7 +0,0 @@
-codetoanalyze/objc/ioslinters/unavailable_api_allowed_cases.m, Unavailable_api_allowed_cases_m2, 120, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
-codetoanalyze/objc/ioslinters/unavailable_api_allowed_cases.m, Unavailable_api_allowed_cases_m3:, 128, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
-codetoanalyze/objc/ioslinters/unavailable_api_allowed_cases.m, Unavailable_api_allowed_cases_uifont_without_respondstoselector:, 102, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
-codetoanalyze/objc/ioslinters/unavailable_api_allowed_cases.m, Unavailable_api_allowed_cases_with_responds_to_selector_in_else:, 68, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
-codetoanalyze/objc/ioslinters/unavailable_api_allowed_cases.m, Unavailable_api_allowed_cases_without_responds_to_selector:, 61, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
-codetoanalyze/objc/ioslinters/unavailable_api_in_supported_ios_sdk.m, OpenURLOptionsFromSourceApplication, 18, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
-codetoanalyze/objc/ioslinters/unavailable_api_in_supported_ios_sdk.m, Unavailable_api_in_supported_ios_sdk_test:and:, 11, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
diff --git a/infer/tests/codetoanalyze/objc/ioslinters/Makefile b/infer/tests/codetoanalyze/objc/ioslints/Makefile
similarity index 100%
rename from infer/tests/codetoanalyze/objc/ioslinters/Makefile
rename to infer/tests/codetoanalyze/objc/ioslints/Makefile
diff --git a/infer/tests/codetoanalyze/objc/ioslints/issues.exp b/infer/tests/codetoanalyze/objc/ioslints/issues.exp
new file mode 100644
index 000000000..fa17cf753
--- /dev/null
+++ b/infer/tests/codetoanalyze/objc/ioslints/issues.exp
@@ -0,0 +1,7 @@
+codetoanalyze/objc/ioslints/unavailable_api_allowed_cases.m, Unavailable_api_allowed_cases_m2, 120, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
+codetoanalyze/objc/ioslints/unavailable_api_allowed_cases.m, Unavailable_api_allowed_cases_m3:, 128, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
+codetoanalyze/objc/ioslints/unavailable_api_allowed_cases.m, Unavailable_api_allowed_cases_uifont_without_respondstoselector:, 102, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
+codetoanalyze/objc/ioslints/unavailable_api_allowed_cases.m, Unavailable_api_allowed_cases_with_responds_to_selector_in_else:, 68, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
+codetoanalyze/objc/ioslints/unavailable_api_allowed_cases.m, Unavailable_api_allowed_cases_without_responds_to_selector:, 61, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
+codetoanalyze/objc/ioslints/unavailable_api_in_supported_ios_sdk.m, OpenURLOptionsFromSourceApplication, 26, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
+codetoanalyze/objc/ioslints/unavailable_api_in_supported_ios_sdk.m, Unavailable_api_in_supported_ios_sdk_test:and:, 19, UNAVAILABLE_API_IN_SUPPORTED_IOS_SDK, []
diff --git a/infer/tests/codetoanalyze/objc/ioslinters/unavailable_api_allowed_cases.m b/infer/tests/codetoanalyze/objc/ioslints/unavailable_api_allowed_cases.m
similarity index 100%
rename from infer/tests/codetoanalyze/objc/ioslinters/unavailable_api_allowed_cases.m
rename to infer/tests/codetoanalyze/objc/ioslints/unavailable_api_allowed_cases.m
diff --git a/infer/tests/codetoanalyze/objc/ioslinters/unavailable_api_in_supported_ios_sdk.m b/infer/tests/codetoanalyze/objc/ioslints/unavailable_api_in_supported_ios_sdk.m
similarity index 62%
rename from infer/tests/codetoanalyze/objc/ioslinters/unavailable_api_in_supported_ios_sdk.m
rename to infer/tests/codetoanalyze/objc/ioslints/unavailable_api_in_supported_ios_sdk.m
index e6e3ce675..997c5acb6 100644
--- a/infer/tests/codetoanalyze/objc/ioslinters/unavailable_api_in_supported_ios_sdk.m
+++ b/infer/tests/codetoanalyze/objc/ioslints/unavailable_api_in_supported_ios_sdk.m
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2017 - present Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
 #import <UIKit/UIKit.h>
 
 @interface Unavailable_api_in_supported_ios_sdk : NSObject