Richard Morris, commercial director of the European Marine Energy Center, signed a deal with the Japanese company to develop the test center, the first for Japan.
"We are leading international efforts to harness the unbridled energy of the seas to deliver safe, secure and sustainable energy and help protect the planet for future generations," Scottish Finance Secretary John Swinney said in a statement.
Edinburgh said 65 Japanese companies are investing in Scotland. Japan's Samsung in January decided to base its first European offshore wind project off the eastern Scottish coast.
Japan examined its energy mix after a March 11, 2011, earthquake and tsunami crippled the country's nuclear energy sector.
Swinney heads to Asia next month to highlight the investment opportunities in Scotland's renewable energy sector. Edinburgh aims to have a referendum for independence in 2014 and touts renewables as a way to sustain that effort.