diff --git a/integration_test/approved_yubikeys.dart b/integration_test/_approved_yubikeys.dart
similarity index 94%
rename from integration_test/approved_yubikeys.dart
rename to integration_test/_approved_yubikeys.dart
index 7712e142..fdc17899 100644
--- a/integration_test/approved_yubikeys.dart
+++ b/integration_test/_approved_yubikeys.dart
@@ -15,4 +15,6 @@
  */
 
 /// list of YubiKey serial numbers which are approved to be used with integration tests
-var approvedYubiKeys = <String>[];
+var approvedYubiKeys = <String>[
+  '',
+];
diff --git a/integration_test/management_test.dart b/integration_test/management_test.dart
index b661c980..6b16a3be 100644
--- a/integration_test/management_test.dart
+++ b/integration_test/management_test.dart
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:flutter/material.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:yubico_authenticator/app/views/keys.dart' as app_keys;
 import 'package:yubico_authenticator/management/views/keys.dart'
     as management_keys;
 
-import 'test_util.dart';
+import 'utils/test_util.dart';
 
 Key _getCapabilityWidgetKey(bool isUsb, String name) =>
     Key('management.keys.capability.${isUsb ? 'usb' : 'nfc'}.$name');
diff --git a/integration_test/oath_test.dart b/integration_test/oath_test.dart
index c90b5d14..28c423d4 100644
--- a/integration_test/oath_test.dart
+++ b/integration_test/oath_test.dart
@@ -19,8 +19,8 @@ import 'package:integration_test/integration_test.dart';
 import 'package:yubico_authenticator/core/state.dart';
 import 'package:yubico_authenticator/oath/keys.dart' as keys;
 
-import 'oath_test_util.dart';
-import 'test_util.dart';
+import 'utils/oath_test_util.dart';
+import 'utils/test_util.dart';
 
 void main() {
   var binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
diff --git a/integration_test/android/test_driver.dart b/integration_test/utils/android/test_driver.dart
similarity index 100%
rename from integration_test/android/test_driver.dart
rename to integration_test/utils/android/test_driver.dart
diff --git a/integration_test/android/util.dart b/integration_test/utils/android/util.dart
similarity index 100%
rename from integration_test/android/util.dart
rename to integration_test/utils/android/util.dart
diff --git a/integration_test/desktop/util.dart b/integration_test/utils/desktop/util.dart
similarity index 100%
rename from integration_test/desktop/util.dart
rename to integration_test/utils/desktop/util.dart
diff --git a/integration_test/oath_test_util.dart b/integration_test/utils/oath_test_util.dart
similarity index 99%
rename from integration_test/oath_test_util.dart
rename to integration_test/utils/oath_test_util.dart
index ed8844b6..4847524b 100644
--- a/integration_test/oath_test_util.dart
+++ b/integration_test/utils/oath_test_util.dart
@@ -22,7 +22,7 @@ import 'package:yubico_authenticator/oath/views/account_list.dart';
 import 'package:yubico_authenticator/oath/views/account_view.dart';
 
 import 'android/util.dart';
-import 'test_util.dart';
+import '../utils/test_util.dart';
 
 class Account {
   final String? issuer;
diff --git a/integration_test/test_util.dart b/integration_test/utils/test_util.dart
similarity index 98%
rename from integration_test/test_util.dart
rename to integration_test/utils/test_util.dart
index ea9333e8..714f79ff 100644
--- a/integration_test/test_util.dart
+++ b/integration_test/utils/test_util.dart
@@ -24,11 +24,11 @@ import 'package:yubico_authenticator/core/state.dart';
 import 'package:yubico_authenticator/management/views/keys.dart';
 
 import 'android/util.dart' as android_test_util;
-import 'approved_yubikeys.dart';
+import '../_approved_yubikeys.dart';
 import 'desktop/util.dart' as desktop_test_util;
 
-const shortWaitMs = 10;
-const longWaitMs = 50;
+const shortWaitMs = 500;
+const longWaitMs = 500;
 
 /// information about YubiKey as seen by the app
 String? yubiKeyName;