Among the tests carried out were air defence and surface missile simulation drills, according to a senior Qatari naval officer.
The ships which took part in the exercise off Qatar's east coast included gun boats as well as coastguard and supply vessels.
Four ships from the US Navy took part.
The joint exercise was requested by the US Navy "a few weeks back", according to Staff Commander Mohammed Desmal Al- Kuwari.
More From This Section
"There are many allies asking for exercises within our waters," he told AFP.
"Many navies from our European allies are asking for exercises."
The Qatari and US navies carry out joint exercises off the Qatari coast around four times a year, said Commander Al- Kuwari, the joint exercise commander.
He added that despite the diplomatic tension in the Gulf, Qatar's navy was carrying out its duties "as normal".
Saudi Arabia and allies have imposed a political and economic "blockade" on Qatar, in protest at Doha's alleged support for Islamist extremist groups as well as over its ties to Shiite Iran.
Qatar strongly denies the charges and claims neighbouring countries are trying to interfere with its foreign policy.
Military ties between the US and Qatar remain strong.
America's largest air base in the Middle East, Al-Udeid, is in Qatar.
And earlier this week the United States agreed a $12- billion sale to Qatar of "state-of-the-art" F-15 fighters.
The deal was signed in Washington on June 14.
The Pentagon said the deal would "increase security cooperation and interoperability between the United States and Qatar".