By early 1985, the squadron began to prepare for transition to the F/A-18 Hornet. About half of the A-7E's and personnel who maintained them had been transferred from the squadron when the squadron was ordered to MCAS Iwakuni, Japan under the Marine Corps Unit Deployment Program. In less than three months, the squadron was fully manned and equipped with 12 A-7E's, and on June 3, 1985 launched for a three-day transpacific flight to Iwakuni. Upon arrival, the squadron became part of Marine Aircraft Group 12 under the 1st Marine Air Wing.