diff --git a/nearby/framework/Android.bp b/nearby/framework/Android.bp
index 1f1dac5..74980c9 100644
--- a/nearby/framework/Android.bp
+++ b/nearby/framework/Android.bp
@@ -66,7 +66,7 @@
     visibility: [
         "//packages/modules/Nearby/service",
         "//packages/modules/Nearby/halfsheet",
-        "//packages/modules/Nearby/tests",
+        "//packages/modules/Nearby/tests:__subpackages__",
     ],
 }
 
diff --git a/nearby/tests/Android.bp b/nearby/tests/unit/Android.bp
similarity index 100%
rename from nearby/tests/Android.bp
rename to nearby/tests/unit/Android.bp
diff --git a/nearby/tests/AndroidManifest.xml b/nearby/tests/unit/AndroidManifest.xml
similarity index 100%
rename from nearby/tests/AndroidManifest.xml
rename to nearby/tests/unit/AndroidManifest.xml
diff --git a/nearby/tests/AndroidTest.xml b/nearby/tests/unit/AndroidTest.xml
similarity index 100%
rename from nearby/tests/AndroidTest.xml
rename to nearby/tests/unit/AndroidTest.xml
diff --git a/nearby/tests/src/android/nearby/ScanRequestTest.java b/nearby/tests/unit/src/android/nearby/ScanRequestTest.java
similarity index 100%
rename from nearby/tests/src/android/nearby/ScanRequestTest.java
rename to nearby/tests/unit/src/android/nearby/ScanRequestTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/ble/BleRecordTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/ble/BleRecordTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/ble/BleRecordTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/ble/BleRecordTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/AccountKeyGeneratorTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/AccountKeyGeneratorTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/AccountKeyGeneratorTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/AccountKeyGeneratorTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/AdditionalDataEncoderTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/AdditionalDataEncoderTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/AdditionalDataEncoderTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/AdditionalDataEncoderTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/AesCtrMultipleBlockEncryptionTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/AesCtrMultipleBlockEncryptionTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/AesCtrMultipleBlockEncryptionTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/AesCtrMultipleBlockEncryptionTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/AesEcbSingleBlockEncryptionTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/AesEcbSingleBlockEncryptionTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/AesEcbSingleBlockEncryptionTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/AesEcbSingleBlockEncryptionTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/BluetoothAddressTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/BluetoothAddressTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/BluetoothAddressTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/BluetoothAddressTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/BluetoothUuidsTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/BluetoothUuidsTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/BluetoothUuidsTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/BluetoothUuidsTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/ConstantsTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/ConstantsTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/ConstantsTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/ConstantsTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/EllipticCurveDiffieHellmanExchangeTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/EllipticCurveDiffieHellmanExchangeTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/EllipticCurveDiffieHellmanExchangeTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/EllipticCurveDiffieHellmanExchangeTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/EventTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/EventTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/EventTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/EventTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/FastPairHistoryItemTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/FastPairHistoryItemTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/FastPairHistoryItemTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/FastPairHistoryItemTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/HeadsetPieceTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/HeadsetPieceTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/HeadsetPieceTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/HeadsetPieceTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/HmacSha256Test.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/HmacSha256Test.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/HmacSha256Test.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/HmacSha256Test.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/MessageStreamHmacEncoderTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/MessageStreamHmacEncoderTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/MessageStreamHmacEncoderTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/MessageStreamHmacEncoderTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/NamingEncoderTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/NamingEncoderTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/NamingEncoderTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/NamingEncoderTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/TimingLoggerTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/TimingLoggerTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/fastpair/TimingLoggerTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/fastpair/TimingLoggerTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/gatt/BluetoothGattConnectionTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/gatt/BluetoothGattConnectionTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/gatt/BluetoothGattConnectionTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/gatt/BluetoothGattConnectionTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/gatt/BluetoothGattHelperTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/gatt/BluetoothGattHelperTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/gatt/BluetoothGattHelperTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/gatt/BluetoothGattHelperTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/util/BluetoothGattUtilsTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/util/BluetoothGattUtilsTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/util/BluetoothGattUtilsTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/util/BluetoothGattUtilsTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/bluetooth/util/BluetoothOperationExecutorTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/util/BluetoothOperationExecutorTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/bluetooth/util/BluetoothOperationExecutorTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/bluetooth/util/BluetoothOperationExecutorTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/common/eventloop/EventLoopTest.java b/nearby/tests/unit/src/com/android/server/nearby/common/eventloop/EventLoopTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/common/eventloop/EventLoopTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/common/eventloop/EventLoopTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/fastpair/FastPairManagerTest.java b/nearby/tests/unit/src/com/android/server/nearby/fastpair/FastPairManagerTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/fastpair/FastPairManagerTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/fastpair/FastPairManagerTest.java
diff --git a/nearby/tests/src/com/android/server/nearby/fastpair/cache/FastPairCacheManagerTest.java b/nearby/tests/unit/src/com/android/server/nearby/fastpair/cache/FastPairCacheManagerTest.java
similarity index 100%
rename from nearby/tests/src/com/android/server/nearby/fastpair/cache/FastPairCacheManagerTest.java
rename to nearby/tests/unit/src/com/android/server/nearby/fastpair/cache/FastPairCacheManagerTest.java