Elaiochori () is a village in the municipality of Kalamata, Messenia, Peloponnese, southern Greece. It was once known as Gianitsa or Giannitsa.