diff --git a/tests/HackLibTestForwardOnlyIterator.php b/tests/HackLibTestForwardOnlyIterator.php
index 24942281..c57b9c15 100644
--- a/tests/HackLibTestForwardOnlyIterator.php
+++ b/tests/HackLibTestForwardOnlyIterator.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/HackLibTestStringable.php b/tests/HackLibTestStringable.php
index 5122f493..809fc533 100644
--- a/tests/HackLibTestStringable.php
+++ b/tests/HackLibTestStringable.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/HackLibTestTraversables.php b/tests/HackLibTestTraversables.php
index 127fc4ac..9481fc98 100644
--- a/tests/HackLibTestTraversables.php
+++ b/tests/HackLibTestTraversables.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/RefTest.php b/tests/RefTest.php
index a96ba036..1503f684 100644
--- a/tests/RefTest.php
+++ b/tests/RefTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/async/ConditionTest.php b/tests/async/ConditionTest.php
index c7bb7305..dc26e93c 100644
--- a/tests/async/ConditionTest.php
+++ b/tests/async/ConditionTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/async/PollTest.php b/tests/async/PollTest.php
index 4f52231a..567f87bb 100644
--- a/tests/async/PollTest.php
+++ b/tests/async/PollTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/async/SemaphoreTest.php b/tests/async/SemaphoreTest.php
index 9251d817..75d2b81a 100644
--- a/tests/async/SemaphoreTest.php
+++ b/tests/async/SemaphoreTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/c/CIntrospectTest.php b/tests/c/CIntrospectTest.php
index 2da0d3a1..2597032b 100644
--- a/tests/c/CIntrospectTest.php
+++ b/tests/c/CIntrospectTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/c/COrderTest.php b/tests/c/COrderTest.php
index a7593b9c..86b1c6b2 100644
--- a/tests/c/COrderTest.php
+++ b/tests/c/COrderTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
diff --git a/tests/c/CReduceTest.php b/tests/c/CReduceTest.php
index 0e7f8706..a67955eb 100644
--- a/tests/c/CReduceTest.php
+++ b/tests/c/CReduceTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/c/CSelectTest.php b/tests/c/CSelectTest.php
index 45e94945..6bac8f05 100644
--- a/tests/c/CSelectTest.php
+++ b/tests/c/CSelectTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/dict/DictAsyncTest.php b/tests/dict/DictAsyncTest.php
index 2ce57325..4fabd476 100644
--- a/tests/dict/DictAsyncTest.php
+++ b/tests/dict/DictAsyncTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/dict/DictCombineTest.php b/tests/dict/DictCombineTest.php
index f94fb2de..7bd9915c 100644
--- a/tests/dict/DictCombineTest.php
+++ b/tests/dict/DictCombineTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/dict/DictDivideTest.php b/tests/dict/DictDivideTest.php
index b595cafc..5d347080 100644
--- a/tests/dict/DictDivideTest.php
+++ b/tests/dict/DictDivideTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/dict/DictIntrospectTest.php b/tests/dict/DictIntrospectTest.php
index d3597534..57678962 100644
--- a/tests/dict/DictIntrospectTest.php
+++ b/tests/dict/DictIntrospectTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/dict/DictOrderTest.php b/tests/dict/DictOrderTest.php
index c0cb5c4f..d2c703c7 100644
--- a/tests/dict/DictOrderTest.php
+++ b/tests/dict/DictOrderTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/dict/DictSelectTest.php b/tests/dict/DictSelectTest.php
index 8011ed79..dc48ac8d 100644
--- a/tests/dict/DictSelectTest.php
+++ b/tests/dict/DictSelectTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/dict/DictTransformTest.php b/tests/dict/DictTransformTest.php
index a8df5137..bdbc1563 100644
--- a/tests/dict/DictTransformTest.php
+++ b/tests/dict/DictTransformTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/file/FileTest.php b/tests/file/FileTest.php
index fe3dd004..0b32e46c 100644
--- a/tests/file/FileTest.php
+++ b/tests/file/FileTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/file/RelativePathTest.php b/tests/file/RelativePathTest.php
index db17ec8b..f2afded2 100644
--- a/tests/file/RelativePathTest.php
+++ b/tests/file/RelativePathTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/io/BufferedReaderTest.php b/tests/io/BufferedReaderTest.php
index d48ff632..1f49bf77 100644
--- a/tests/io/BufferedReaderTest.php
+++ b/tests/io/BufferedReaderTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/io/MemoryHandleTest.php b/tests/io/MemoryHandleTest.php
index 373baf72..000a05c4 100644
--- a/tests/io/MemoryHandleTest.php
+++ b/tests/io/MemoryHandleTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/io/PipeTest.php b/tests/io/PipeTest.php
index e17d3a9c..bdc63783 100644
--- a/tests/io/PipeTest.php
+++ b/tests/io/PipeTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/keyset/KeysetAsyncTest.php b/tests/keyset/KeysetAsyncTest.php
index f1acbe74..86796c04 100644
--- a/tests/keyset/KeysetAsyncTest.php
+++ b/tests/keyset/KeysetAsyncTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/keyset/KeysetCombineTest.php b/tests/keyset/KeysetCombineTest.php
index fbd4f349..d3538abd 100644
--- a/tests/keyset/KeysetCombineTest.php
+++ b/tests/keyset/KeysetCombineTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/keyset/KeysetDivideTest.php b/tests/keyset/KeysetDivideTest.php
index 7ea6f80b..780256b6 100644
--- a/tests/keyset/KeysetDivideTest.php
+++ b/tests/keyset/KeysetDivideTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/keyset/KeysetIntrospectTest.php b/tests/keyset/KeysetIntrospectTest.php
index df86b345..0ad90510 100644
--- a/tests/keyset/KeysetIntrospectTest.php
+++ b/tests/keyset/KeysetIntrospectTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/keyset/KeysetOrderTest.php b/tests/keyset/KeysetOrderTest.php
index cc177853..9b26d868 100644
--- a/tests/keyset/KeysetOrderTest.php
+++ b/tests/keyset/KeysetOrderTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/keyset/KeysetSelectTest.php b/tests/keyset/KeysetSelectTest.php
index a5b9184f..9aeae257 100644
--- a/tests/keyset/KeysetSelectTest.php
+++ b/tests/keyset/KeysetSelectTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/keyset/KeysetTransformTest.php b/tests/keyset/KeysetTransformTest.php
index 85fccd96..64664170 100644
--- a/tests/keyset/KeysetTransformTest.php
+++ b/tests/keyset/KeysetTransformTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/locale/LocaleTest.php b/tests/locale/LocaleTest.php
index 1c5f8b33..31056c87 100644
--- a/tests/locale/LocaleTest.php
+++ b/tests/locale/LocaleTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/math/MathCompareTest.php b/tests/math/MathCompareTest.php
index 334b30f5..86a3a7f8 100644
--- a/tests/math/MathCompareTest.php
+++ b/tests/math/MathCompareTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/math/MathComputeTest.php b/tests/math/MathComputeTest.php
index 724d20f2..042221d8 100644
--- a/tests/math/MathComputeTest.php
+++ b/tests/math/MathComputeTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/math/MathConstantsTest.php b/tests/math/MathConstantsTest.php
index 8fd8742d..483b7aec 100644
--- a/tests/math/MathConstantsTest.php
+++ b/tests/math/MathConstantsTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/math/MathContainersTest.php b/tests/math/MathContainersTest.php
index 4bd0a3e5..a581166f 100644
--- a/tests/math/MathContainersTest.php
+++ b/tests/math/MathContainersTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/os/MkdtempTest.php b/tests/os/MkdtempTest.php
index 14f53f76..8cfd6872 100644
--- a/tests/os/MkdtempTest.php
+++ b/tests/os/MkdtempTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/os/SpawnTest.php b/tests/os/SpawnTest.php
index 81187fc4..7680fb4c 100644
--- a/tests/os/SpawnTest.php
+++ b/tests/os/SpawnTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/random/PseudoRandomTest.php b/tests/random/PseudoRandomTest.php
index 10bc7682..7df6d3cf 100644
--- a/tests/random/PseudoRandomTest.php
+++ b/tests/random/PseudoRandomTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/random/RandomTestTrait.php b/tests/random/RandomTestTrait.php
index 40482073..b2e919db 100644
--- a/tests/random/RandomTestTrait.php
+++ b/tests/random/RandomTestTrait.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/random/SecureRandomTest.php b/tests/random/SecureRandomTest.php
index 5811c6e7..fccfc05e 100644
--- a/tests/random/SecureRandomTest.php
+++ b/tests/random/SecureRandomTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/regex/RegexTest.php b/tests/regex/RegexTest.php
index 372b04c6..34544166 100644
--- a/tests/regex/RegexTest.php
+++ b/tests/regex/RegexTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/str/StrCombineTest.php b/tests/str/StrCombineTest.php
index 4f22ae09..ca902118 100644
--- a/tests/str/StrCombineTest.php
+++ b/tests/str/StrCombineTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/str/StrDivideTest.php b/tests/str/StrDivideTest.php
index e8146cb5..5a6633be 100644
--- a/tests/str/StrDivideTest.php
+++ b/tests/str/StrDivideTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/str/StrFormatTest.php b/tests/str/StrFormatTest.php
index a180d8b8..0e6faa71 100644
--- a/tests/str/StrFormatTest.php
+++ b/tests/str/StrFormatTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/str/StrIntrospectTest.php b/tests/str/StrIntrospectTest.php
index 3e962b46..2f970f2f 100644
--- a/tests/str/StrIntrospectTest.php
+++ b/tests/str/StrIntrospectTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/str/StrLocaleTest.php b/tests/str/StrLocaleTest.php
index a15e9691..743ec434 100644
--- a/tests/str/StrLocaleTest.php
+++ b/tests/str/StrLocaleTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/str/StrSelectTest.php b/tests/str/StrSelectTest.php
index 9e338a54..53e9fa8f 100644
--- a/tests/str/StrSelectTest.php
+++ b/tests/str/StrSelectTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/str/StrTransformTest.php b/tests/str/StrTransformTest.php
index bd5a573f..88268ee9 100644
--- a/tests/str/StrTransformTest.php
+++ b/tests/str/StrTransformTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/tcp/HSLTCPTest.php b/tests/tcp/HSLTCPTest.php
index 36bfcb25..c556aff7 100644
--- a/tests/tcp/HSLTCPTest.php
+++ b/tests/tcp/HSLTCPTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/unix/HSLUnixSocketTest.php b/tests/unix/HSLUnixSocketTest.php
index 89b0ed4f..72c49744 100644
--- a/tests/unix/HSLUnixSocketTest.php
+++ b/tests/unix/HSLUnixSocketTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/vec/VecAsyncTest.php b/tests/vec/VecAsyncTest.php
index a7a29654..4bea21ce 100644
--- a/tests/vec/VecAsyncTest.php
+++ b/tests/vec/VecAsyncTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/vec/VecCombineTest.php b/tests/vec/VecCombineTest.php
index 6714b88d..0d650bf9 100644
--- a/tests/vec/VecCombineTest.php
+++ b/tests/vec/VecCombineTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/vec/VecDivideTest.php b/tests/vec/VecDivideTest.php
index d01dffe9..9ff444c8 100644
--- a/tests/vec/VecDivideTest.php
+++ b/tests/vec/VecDivideTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/vec/VecOrderTest.php b/tests/vec/VecOrderTest.php
index b132cdf6..40863673 100644
--- a/tests/vec/VecOrderTest.php
+++ b/tests/vec/VecOrderTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/vec/VecSelectTest.php b/tests/vec/VecSelectTest.php
index 00f1c802..29617a28 100644
--- a/tests/vec/VecSelectTest.php
+++ b/tests/vec/VecSelectTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.
diff --git a/tests/vec/VecTransformTest.php b/tests/vec/VecTransformTest.php
index b03fb7b1..93557204 100644
--- a/tests/vec/VecTransformTest.php
+++ b/tests/vec/VecTransformTest.php
@@ -1,4 +1,4 @@
-<?hh // strict
+<?hh
 /*
  *  Copyright (c) 2004-present, Facebook, Inc.
  *  All rights reserved.