diff --git a/tests/tests/hardware/src/android/hardware/fingerprint/cts/FingerprintManagerTest.java b/tests/tests/hardware/src/android/hardware/fingerprint/cts/FingerprintManagerTest.java
index dc03b38..95704b9 100644
--- a/tests/tests/hardware/src/android/hardware/fingerprint/cts/FingerprintManagerTest.java
+++ b/tests/tests/hardware/src/android/hardware/fingerprint/cts/FingerprintManagerTest.java
@@ -55,12 +55,11 @@
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        // TODO: pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
-        // PackageManager pm = getContext().getPackageManager();
-        mHasFingerprintManager = true;
         mAuthState = AuthState.AUTH_UNKNOWN;
 
-        if (mHasFingerprintManager) {
+        PackageManager pm = getContext().getPackageManager();
+        if (pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
+            mHasFingerprintManager = true;
             mFingerprintManager = (FingerprintManager)
                     getContext().getSystemService(Context.FINGERPRINT_SERVICE);
         }