diff --git a/android/Makefile.am b/android/Makefile.am
index 6ac9d7e..c7a56f8 100644
--- a/android/Makefile.am
+++ b/android/Makefile.am
android/pics-gatt.txt \
android/pics-mcap.txt \
android/pics-hdp.txt \
+ android/pics-iopt.txt \
android/pixit-l2cap.txt \
android/pixit-gap.txt \
android/pixit-did.txt \
android/pixit-gatt.txt \
android/pixit-mcap.txt \
android/pixit-hdp.txt \
+ android/pixit-iopt.txt \
android/pts-l2cap.txt \
android/pts-gap.txt \
android/pts-did.txt \
android/pts-avctp.txt \
android/pts-pbap.txt \
android/pts-hfp.txt \
- android/pts-hsp.txt
+ android/pts-hsp.txt \
+ android/pts-iopt.txt
diff --git a/android/pics-iopt.txt b/android/pics-iopt.txt
new file mode 100644
index 0000000..a1289ef
--- /dev/null
+++ b/android/pics-iopt.txt
+IOPT PICS for the PTS tool.
+
+PTS version: 5.1
+
+* - different than PTS defaults
+# - not yet implemented/supported
+
+M - mandatory
+O - optional
+
+ Profiles
+-------------------------------------------------------------------------------
+Parameter Name Selected Description
+-------------------------------------------------------------------------------
+TSPC_support_ Support for: Advanced
+AdvancedAudioDistributionProfile_Sink False Audio Distribution
+ Profile. Role: Sink
+
+TSPC_support_ Support for: Advanced
+AdvancedAudioDistributionProfile_Source True (*) Audio Distribution
+ Profile. Role: Source
+
+TSPC_support_AVRemoteControlProfile_CT True (*) Support for: Audio\Video
+ Remote Control Profile.
+ Role: Controller
+
+TSPC_support_AVRemoteControlProfile_TG True (*) Support for: Audio\Video
+ Remote Control Profile.
+ Role: Target
+
+TSPC_support_BasicImagingProfile_CLIENT False Support for: Basic
+ Imaging Profile.
+ Role: Client
+
+TSPC_support_BasicImagingProfile_ Support for: Basic
+SERVER_ImagingAutomaticArchive False Imaging Profile. Role:
+ Server Functionality:
+ Imaging autoarchive
+
+TSPC_support_BasicImagingProfile_ False Support for: Basic
+SERVER_ImagingReferencedObjects Imaging Profile. Role:
+ Server Functionality:
+ Imaging ref. objects
+
+TSPC_support_BasicImagingProfile_ False Support for: Basic
+SERVER_ImagingResponder Imaging Profile. Role:
+ Server Functionality:
+ Imaging responder
+
+TSPC_support_ False Support for: Basic
+BasicPrintingProfile_PRINTER Printing Profile. Role:
+ Printer
+
+TSPC_support_ Support for: Basic
+BasicPriProfile_PRINTER_ReflectedUI False Printing Profile. Role:
+ Printer Functionality:
+ Reflected UI
+
+TSPC_support_BasicPrintingProfile_ Support for: Basic
+SENDER_Referenced_objects_Service False Printing Profile. Role:
+ Sender Functionality:
+ Refe. objects service
+
+TSPC_support_DialUpNetworkingProfile_DT False Support for: Dial-Up
+ Networking Profile.
+ Role: Data Terminal
+
+TSPC_support_DialUpNetworkingProfile_GW False Support for: Dial-Up
+ Networking Profile.
+ Role: Gateway
+
+TSPC_support_ True (*) Support for: Extended
+ExtendedServiceDiscoveryProfile_IP_LAP SDP. Version: IP-LAP
+
+TSPC_support_ True (*) Support for: Extended
+ExtendedServiceDiscoveryProfile_IP_PAN SDP. Version: IP-PAN
+
+TSPC_support_ True (*) Support for: Extended
+ExtendedServiceDiscoveryProfile_L2CAP SDP. Version: L2CAP
+
+TSPC_support_FAXProfile_DE False Support for: FAX Profile
+ Role: Data Terminal
+
+TSPC_support_FAXProfile_GW False Support for: FAX Profile
+ Role: Gateway
+
+TSPC_support_FileTransferProfile_CLIENT False Support for: FTP
+ Role: Client
+
+TSPC_support_FileTransferProfile_SERVER False Support for: FTP
+ Role: Server
+
+TSPC_support_HealthDeviceProfile_Sink False (#) Support for: HDP
+ Role: Sink
+
+TSPC_support_HealthDeviceProfile_Source False (#) Support for: HDP
+ Role: Source
+
+TSPC_support_NewHandsFreeProfile_AG False Support for: HFP
+ Role: Audio gateway
+
+TSPC_support_NewHandsFreeProfile_HF False Support for: HFP
+ Role: Hands-Free unit
+
+TSPC_support_ False Support for: Hard Copy
+HardCopyReplacementProfile_ cable Repl. Profile
+CLIENT_CR_RegisterNotofication_support Role: Client
+ Functionality: CR
+ register notification
+ support
+
+TSPC_support_ False Support for: Hard Copy
+HardCopyReplacementProfile_CLIENT_print cable Repl. Profile.
+ Role: Client
+ Functionality: Print
+
+TSPC_support_ False Support for: Hard Copy
+HardCopyReplacementProfile_CLIENT_scan cable Repl. Profile.
+ Role: Client
+ Functionality: Scan
+
+TSPC_support_ False Support for: Hard Copy
+HardCopyReplacementProfile_SERVER_print cable Repl. Profile.
+ Role: Server
+ Functionality: Print
+
+TSPC_support_ False Support for: Hard Copy
+HardCopyReplacementProfile_SERVER_scan cable Repl. Profile.
+ Role: Server
+ Functionality: Scan
+
+TSPC_support_HeadsetProfile_AG True (*) Support for: HSP
+ Role: Audio Gateway
+
+TSPC_support_HeadsetProfile_HS False Support for: HSP
+ Role: Headset
+
+TSPC_support_ False Support for: HID
+HumanInterfaceDeviceProfile Role: Device
+
+TSPC_support_HID_Host True (*) Support for: HID
+ Role: Host
+
+TSPC_support_LANAccessProfile_DT False Support for: LAN Access
+ Profile. Role: Data
+ Terminal
+
+TSPC_support_LANAccessProfile_LAP False Support for: LAN Access
+ Profile. Role: LAN
+ Access Point
+
+TSPC_support_MessaeAccessProfile_MCE False Support for: MAP
+ Role: MCE
+
+TSPC_support_MessageAccessProfile_MSE True (*) Support for: MAP
+ Role: MSE
+
+TSPC_support_ObjectPushProfile_CLIENT True (*) Support for: OPP
+ Role: Client
+
+TSPC_support_ObjectPushProfile_SERVER True (*) Support for: OPP
+ Role: Server
+
+TSPC_support_ False Support for: PAN
+PersonalAreaNetworkProfile_GN Role: GN
+
+TSPC_support_ True (*) Support for: PAN
+PersonalAreaNetworkProfile_NAP Role: NAP
+
+TSPC_support_ True (*) Support for: PAN
+PersonalAreaNetworkProfile_PANU Role: PANU
+
+TSPC_support_PhonebookAccessProfile_PCE False Support for: PBAP
+ Role: PCE
+
+TSPC_support_PhonebookAccessProfile_PSE True (*) Support for: PBAP
+ Role: PSE
+
+TSPC_support_SerialPortProfile_Service False Support for: SPP
+ Role: Dev B
+
+TSPC_support_ False Support for: Service
+ServiceDiscoveryApplicationProfile Discovery Application
+ Profile
+
+TSPC_support_SIMAccessProfile_CLIENT False Support for: SIM access
+ Profile. Role: Client
+
+TSPC_support_SIMAccessProfile_SERVER False Support for: SIM access
+ Profile. Role: Server
+
+TSPC_support_ False Support for:
+SynchronizationProfile_CLIENT Synchronization Profile
+ Role: Client
+
+TSPC_support_ False Support for:
+SynchronizationProfile_SERVER Synchronization Profile
+ Role: Server
+
+TSPC_support_UDIProfile_MT False Support for: UDI Profile
+ Role: MT
+
+TSPC_support_UDIProfile_TA False Support for: UDI Profile
+ Role: TA
+
+TSPC_support_ False Support for: Video
+VideoDistributionProfile_Sink distribution Profile
+ Role: Sink
+
+TSPC_support_ False Support for: Video
+VideoDistributionProfile_Source distribution Profile
+ Role: Source
+
+TSPC_support_WAPOverBluetooth_CLIENT False Support for: WAP over
+ Bluetooth Profile
+ Role: Client
+
+TSPC_support_WAPOverBluetooth_PROXY False Support for: WAP over
+ Bluetooth Profile
+ Role: PROXY
+
+TSPC_support_GNSS_SERVER False Support for: GNSS
+ Role: Server
diff --git a/android/pixit-iopt.txt b/android/pixit-iopt.txt
new file mode 100644
index 0000000..a4bb581
--- /dev/null
+++ b/android/pixit-iopt.txt
+IOPT PIXIT for the PTS tool.
+
+PTS version: 5.1
+
+* - different than PTS defaults
+& - should be set to IUT Bluetooth address
+
+ Required PIXIT settings
+-------------------------------------------------------------------------------
+Parameter Name Value
+-------------------------------------------------------------------------------
+TSPX_security_enabled FALSE
+TSPX_delete_link_key FALSE
+TSPX_bd_addr_iut 112233445566 (*&)
+TSPX_class_of_device_pts 200404
+TSPX_class_of_device_test_pts_initiator TRUE
+TSPX_limited_inquiry_used FALSE
+TSPX_pin_code 0000
+TSPX_time_guard 200000
+TSPX_device_search_time 20
+TSPX_use_implicit_send TRUE
+TSPX_secure_simple_pairing_pass_key_confirmation FALSE
+-------------------------------------------------------------------------------
diff --git a/android/pts-iopt.txt b/android/pts-iopt.txt
new file mode 100644
index 0000000..815740d
--- /dev/null
+++ b/android/pts-iopt.txt
+PTS test results for IOPT
+
+PTS version: 5.1
+Tested: 08-May-2014
+Android version: 4.4.2
+
+Results:
+PASS test passed
+FAIL test failed
+INC test is inconclusive
+N/A test is disabled due to PICS setup
+
+-------------------------------------------------------------------------------
+Test Name Result Notes
+-------------------------------------------------------------------------------
+TC_COD_BV_01_I PASS IUT must be discoverable
+TC_COD_BV_02_I N/A Under PTS 5.1 test shall be disabled as there is
+ matching test case in HFP test suit (test No. 15)
+ PICS settings for HFP shall be disabled for IOPT
+TC_SDSS_BV_02_I PASS
+TC_SDSA_BV_03_I PASS
+TC_SDR_BV_04_I PASS
+-------------------------------------------------------------------------------