Diabetes mellitus and hypertension are interrelated diseases that strongly predispose to atherosclerotic cardiovascular disease. If blood pressure control is critical to improve cardiovascular prognosis in the hypertensive population, this is even more important in high risk patients, such as those with diabetes. Despite that, most of them do not achieve blood pressure targets. The inhibition of the renin angiotensin system is the first logical therapy in the management of hypertensive patients with diabetes. However, since most of them will need at least two antihypertensive agents to attain blood pressure goals, the current question to be answered is which drugs are the best to associate. According to available evidence, two are the main options: a diuretic or a calcium channel blocker. Many beneficial effects have been described with the use of both. The recent results of ACCOMPLISH trial started to clarify this issue. However, there are still many questions to be resolved before a categorical recommendation may be given about this matter. In the present manuscript, the current data about the treatment of patients with hypertension and diabetes are reviewed.