diff --git a/hphp/test/zend/bad/zend/ns_060.php b/hphp/test/zend/good/zend/ns_060.php
similarity index 100%
rename from hphp/test/zend/bad/zend/ns_060.php
rename to hphp/test/zend/good/zend/ns_060.php
diff --git a/hphp/test/zend/bad/zend/ns_060.php.expectf b/hphp/test/zend/good/zend/ns_060.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/ns_060.php.expectf
rename to hphp/test/zend/good/zend/ns_060.php.expectf
diff --git a/hphp/util/parser/parser.cpp b/hphp/util/parser/parser.cpp
index de8fe32e4..252f4d67c 100644
--- a/hphp/util/parser/parser.cpp
+++ b/hphp/util/parser/parser.cpp
@@ -307,6 +307,7 @@ void ParserBase::onNamespaceStart(const std::string &ns,
   }
   m_nsState = InsideNamespace;
   m_nsFileScope = file_scope;
+  m_aliases.clear();
 
   m_namespace = ns;
 }