Diabetes mellitus is a widespread disease, and represents an important public health burden worldwide. Together with cardiovascular, renal and neurological complications, many patients with diabetes present with gastrointestinal symptoms, which configure the so-called diabetic enteropathy. In this review, we will focus on upper gastrointestinal symptoms in patients with diabetes, with particular attention to dyspepsia and diabetic gastroparesis (DG). These two clinical entities share similar pathogenetic mechanisms, which include autonomic neuropathy, alterations in enteric nervous system and histological abnormalities, such as interstitial cells of Cajal depletion. Moreover, the differential diagnosis may be challenging because of overlapping clinical features. Delayed gastric emptying should be documented to differentiate between DG and dyspepsia and it can be assessed through radioactive or non-radioactive methods. The clinical management of dyspepsia includes a wide range of different approaches, above all Helicobacter pylori test and treat. As regards DG treatment, a central role is played by dietary modification and glucose control and the first-line pharmacological therapy is represented by the use of prokinetics. A minority of patients with DG refractory to medical treatment may require more invasive therapeutic approaches, including supplemental nutrition, gastric electric stimulation, pyloromyotomy and gastrectomy.